Fine-tune manual requirements

This commit is contained in:
Alexey Ivanov 2015-03-12 11:32:02 +00:00
parent de47c2a631
commit 2744329534

View file

@ -185,7 +185,7 @@ Requires(pre): chkconfig mktemp psmisc
Requires(pre): coreutils sed grep
Requires: pam >= 0.64
Requires: samba-common = %{EVRD}
Requires: %{name}-common = %{EVRD}
# samba-python package contains libs on non-standard path which should not be registered in Provides
%define __noautoprov 'samba\\/.*\\.so.*'
@ -202,7 +202,7 @@ Requires: samba-common = %{EVRD}
# None of these is elegant. The last one seems to be least invasive. But it might prove to be too unreliable.
# We'll try it first. But it's likely to be discarded any moment in favor to some other approach.
# Disable autoreq on individual libs to get rid of library dependecy loops and provide deps on these libs to samba-* packages.
%define __noautoreq '(lib(dcerpc-(atsvc|binding|samr|server)|dcerpc|ndr-(krb5pac|nbt|standard)|ndr|gensec|netapi|nss_winbind|pdb|registry|samba-(credentials|hostconfig|policy|util)|samdb|smbclient-raw|smb(client|conf|ldap)|tevent-util|torture|wbclient)|pam_winbind|winbind_krb5_locator)\.so|devel.*'
%define __noautoreq '(lib(ntdb|non_posix_acls|dcerpc-(atsvc|binding|samr|server)|dcerpc|ndr-(krb5pac|nbt|standard)|ndr|gensec|netapi|nss_winbind|pdb|registry|samba-(credentials|hostconfig|policy|util)|samdb|smbclient-raw|smb(client|conf|ldap)|tevent-util|torture|wbclient)|pam_winbind|winbind_krb5_locator)\.so|devel.*'
%description
Samba provides SMB server which can be used to provide network services
@ -239,7 +239,6 @@ Requires(pre): rpm-helper
# without replacement, maybe it will come back later
Obsoletes: %{name}-swat < 4.1.6
#Samba-server and it's libraries were shipped in single package before 4.1.16
Requires: %{libsambaserver} = %{EVRD}
Obsoletes: %{name}-server < 1:4.1.17
%if %{without gtk}
Obsoletes: %{name}-domainjoin-gui < %{EVRD}
@ -247,17 +246,6 @@ Obsoletes: %{name}-domainjoin-gui < %{EVRD}
%rename samba
%rename samba-server-ldap
# A clumzy approach to get rid of LOOPS - provide deps for individual libs _by hand_
Requires: %{libdcerpc} = %{EVRD}
Requires: %{libsmbconf} = %{EVRD}
Requires: %{libgensec} = %{EVRD}
Requires: %{libsambahostconfig} = %{EVRD}
Requires: %{libndr} = %{EVRD}
Requires: %{libcredentials} = %{EVRD}
Requires: %{libsamdb} = %{EVRD}
Requires: %{libpdb} = %{EVRD}
Requires: %{libsambautil} = %{EVRD}
%description server
Samba-server provides SMB server which can be used to provide network services
to SMB (sometimes called "Lan Manager") clients, including various versions
@ -456,6 +444,8 @@ Provides libraries for samba-server
%dir %{_libdir}/samba/vfs
%{_libdir}/mit_samba.so
%{_libdir}/%{name}/nss_info
%{_libdir}/samba/libwinbind-client.so
%{_libdir}/%{name}/idmap
#----------------------------------------------------------------------------
@ -471,23 +461,6 @@ Requires: python-talloc
Requires: python-tdb
%rename samba3-client
# A clumzy approach to get rid of LOOPS - provide deps for individual libs _by hand_
Requires: %{libdcerpc} = %{EVRD}
Requires: %{libsmbconf} = %{EVRD}
Requires: %{libgensec} = %{EVRD}
Requires: %{libtevent_util} = %{EVRD}
Requires: %{libsambahostconfig} = %{EVRD}
Requires: %{libndr} = %{EVRD}
Requires: %{libwbclient} = %{EVRD}
Requires: %{libcredentials} = %{EVRD}
Requires: %{libregistry} = %{EVRD}
Requires: %{libsamdb} = %{EVRD}
Requires: %{libname} = %{EVRD}
Requires: %{libpdb} = %{EVRD}
Requires: %{libnetapi} = %{EVRD}
Requires: %{libsmbldap} = %{EVRD}
Requires: %{libsambautil} = %{EVRD}
%description client
Samba-client provides some SMB clients, which complement the built-in
SMB filesystem in Linux. These allow the accessing of SMB shares, and
@ -554,6 +527,10 @@ Requires(post): systemd
Conflicts: samba3-common
# A clumzy approach to get rid of LOOPS - provide deps for individual libs _by hand_
Requires: %{libsmbldap } = %{EVRD}
Requires: %{libnetapi} = %{EVRD}
Requires: %{libname} = %{EVRD}
Requires: %{libsamdb} = %{EVRD}
Requires: %{libsmbconf} = %{EVRD}
Requires: %{libgensec} = %{EVRD}
Requires: %{libtevent_util} = %{EVRD}
@ -566,6 +543,7 @@ Requires: %{libregistry} = %{EVRD}
Requires: %{libpdb} = %{EVRD}
Requires: %{libsmbldap} = %{EVRD}
Requires: %{libsambautil} = %{EVRD}
Requires: %{libdcerpc} = %{EVRD}
%description common
Samba-common provides files necessary for both the server and client
@ -676,7 +654,6 @@ if [ -f %{_sysconfdir}/%{name}/README.mdk.conf ];then rm -f %{_sysconfdir}/%{nam
%package doc
Summary: Documentation for Samba servers and clients
Group: Documentation
Requires: %{name}-common = %{EVRD}
%description doc
Samba-doc provides documentation files for both the server and client
@ -702,8 +679,6 @@ Provides libraries for winbind daemon and testing tools
%files -n %{libwinbind}
%attr(755,root,root) /%{_lib}/security/pam_winbind*
%attr(755,root,root) /%{_lib}/libnss_winbind*
%{_libdir}/samba/libwinbind-client.so
%{_libdir}/%{name}/idmap
%{_libdir}/winbind_krb5_locator.so
#----------------------------------------------------------------------------
@ -714,18 +689,6 @@ Group: System/Servers
Requires: %{name}-common = %{EVRD}
Requires: %{libwinbind} = %{EVRD}
# A clumzy approach to get rid of LOOPS - provide deps for individual libs _by hand_
Requires: %{libdcerpc} = %{EVRD}
Requires: %{libsmbconf} = %{EVRD}
Requires: %{libgensec} = %{EVRD}
Requires: %{libtevent_util} = %{EVRD}
Requires: %{libsambahostconfig} = %{EVRD}
Requires: %{libwinbind} = %{EVRD}
Requires: %{libndr} = %{EVRD}
Requires: %{libwbclient} = %{EVRD}
Requires: %{libpdb} = %{EVRD}
Requires: %{libsambautil} = %{EVRD}
%description winbind
Provides the winbind daemon and testing tools to allow authentication
and group/user enumeration from a Windows or Samba domain controller.
@ -814,19 +777,7 @@ Group: Development/Python
BuildRequires: pkgconfig(python)
# A clumzy approach to get rid of LOOPS - provide deps for individual libs _by hand_
Requires: %{libdcerpc} = %{EVRD}
Requires: %{libsmbconf} = %{EVRD}
Requires: %{libgensec} = %{EVRD}
Requires: %{libtevent_util} = %{EVRD}
Requires: %{libsambahostconfig} = %{EVRD}
Requires: %{libndr} = %{EVRD}
Requires: %{libcredentials} = %{EVRD}
Requires: %{libregistry} = %{EVRD}
Requires: %{libpolicy} = %{EVRD}
Requires: %{libsamdb} = %{EVRD}
Requires: %{libname} = %{EVRD}
Requires: %{libpdb} = %{EVRD}
Requires: %{libsambautil} = %{EVRD}
%description python
Samba Python modules.
@ -844,21 +795,7 @@ Group: System/Servers
Requires: %{name}-common = %{EVRD}
# A clumzy approach to get rid of LOOPS - provide deps for individual libs _by hand_
Requires: %{libdcerpc} = %{EVRD}
Requires: %{libsmbconf} = %{EVRD}
Requires: %{libgensec} = %{EVRD}
Requires: %{libtevent_util} = %{EVRD}
Requires: %{libsambahostconfig} = %{EVRD}
Requires: %{libwinbind} = %{EVRD}
Requires: %{libndr} = %{EVRD}
Requires: %{libwbclient} = %{EVRD}
Requires: %{libcredentials} = %{EVRD}
Requires: %{libtorture} = %{EVRD}
Requires: %{libregistry} = %{EVRD}
Requires: %{libsamdb} = %{EVRD}
Requires: %{libname} = %{EVRD}
Requires: %{libnetapi} = %{EVRD}
Requires: %{libsambautil} = %{EVRD}
%description test
This package provides tools for benchmarking samba, and debugging the correct
@ -875,7 +812,6 @@ operation of tools against smb servers.
Summary: SMB Client Library
Group: System/Libraries
Provides: libsmbclient = %{EVRD}
Requires: %{libsambaserver} = %{EVRD}
%description -n %{libname}
This package contains the SMB client library, part of the samba suite of
@ -911,7 +847,7 @@ software to access SMB shares.
Summary: Samba 4 development package
Group: Development/C
Requires: %{devname} = %{EVRD}
Requires: %{libsambaserver} = %{EVRD}
Requires: %{name}-common = %{EVRD}
%description devel
Samba 4 development libraries.
@ -1377,7 +1313,6 @@ Utility library for working with the Tevent library.
%package passdb-mysql
Summary: Samba password database plugin for MySQL
Group: System/Libraries
Requires: %{libsambaserver} = %{EVRD}
%description passdb-mysql
The passdb-mysql package for samba provides a password database backend
@ -1438,7 +1373,7 @@ Samba testsuite torture library.
Summary: Domainjoin GUI
Group: System/Configuration/Other
BuildRequires: pkgconfig(gtk+-2.0)
Requires: samba-common = %{EVRD}
Requires: %{name}-common = %{EVRD}
%description domainjoin-gui
The samba-domainjoin-gui package includes a domainjoin gtk application.