relocate samba-util.pc, explicit Requires from samba-devel by devel subpackages, more explicit requires from libsamba-libs0 to make sure that dependencies are solved alongside __noautoreq

This commit is contained in:
Mikhail Novosyolov 2019-05-23 07:57:16 +03:00
parent d5fa1b3af4
commit 70e7066e77

View file

@ -746,6 +746,7 @@ packages of Samba.
Summary: Samba-winbind daemon libraries
Requires: %{libs_config}
Group: System/Libraries
Requires: %{libsambalibs} = %{EVRD}
Conflicts: %{libsambaserver} < 1:4.1.17
%description -n %{libwinbind}
@ -792,6 +793,7 @@ Conflicts: nss_wins < 1:4.1.17
Obsoletes: nss_wins < 1:4.1.17
Provides: nss_wins = %{EVRD}
Requires(pre): glibc
Requires: %{libsambalibs} = %{EVRD}
# A clumzy approach to get rid of LOOPS - provide deps for individual libs _by hand_
Requires: %{libsambalibs} = %{EVRD}
@ -824,6 +826,7 @@ BuildRequires: pkgconfig(python)
# A clumzy approach to get rid of LOOPS - provide deps for individual libs _by hand_
Requires: %{libpolicy} = %{EVRD}
Requires: samba-devel = %{EVRD}
%description python
Samba Python modules.
@ -871,6 +874,7 @@ networking software, allowing other software to access SMB shares.
Summary: SMB Client Library Development files
Group: Development/C
Requires: %{libname} = %{EVRD}
Requires: samba-devel = %{EVRD}
Conflicts: %{_lib}smbclient0-devel < 1:4.1.9-10
Obsoletes: %{_lib}smbclient0-devel < 1:4.1.9-10
@ -921,7 +925,6 @@ Samba 4 development libraries.
%{_includedir}/samba-4.0/util/*.h
%{_includedir}/samba-4.0/util_ldb.h
%{_includedir}/samba-4.0/ldb_wrap.h
%{_libdir}/pkgconfig/samba-util.pc
%{_libdir}/libsamba-errors.so
%{_libdir}/libsamba-passdb.so
%{_libdir}/libsmbconf.so
@ -942,6 +945,7 @@ Samba 4 development libraries.
%package pidl
Summary: Perl IDL compiler for Samba4
Group: Development/Perl
Requires: %{libsambalibs} = %{EVRD}
%description pidl
Perl Interface Description Language compiler for Samba4.
@ -957,6 +961,7 @@ Perl Interface Description Language compiler for Samba4.
%package -n %{libnetapi}
Summary: Samba library for accessing functions in 'net' binary
Group: System/Libraries
Requires: %{libsambalibs} = %{EVRD}
%description -n %{libnetapi}
Samba library for accessing functions in 'net' binary.
@ -970,6 +975,7 @@ Samba library for accessing functions in 'net' binary.
Summary: Samba library for accessing functions in 'net' binary
Group: Development/C
Requires: %{libnetapi} = %{EVRD}
Requires: samba-devel = %{EVRD}
Provides: netapi-devel = %{EVRD}
%description -n %{netapidevel}
@ -985,6 +991,7 @@ Samba library for accessing functions in 'net' binary.
%package -n %{libdcerpc}
Summary: Library implementing DCE/RPC for Samba4
Group: System/Libraries
Requires: %{libsambalibs} = %{EVRD}
%description -n %{libdcerpc}
Library implementing DCE/RPC for Samba4.
@ -1001,6 +1008,7 @@ Library implementing DCE/RPC for Samba4.
Summary: Library implementing Samba's memory allocator
Group: Development/C
Requires: %{libdcerpc} = %{EVRD}
Requires: samba-devel = %{EVRD}
Provides: dcerpc-devel = %{EVRD}
%description -n %{dcerpcdevel}
@ -1019,6 +1027,7 @@ Library implementing Samba's memory allocator.
%package -n %{libndr}
Summary: Network Data Representation library from Samba4
Group: System/Libraries
Requires: %{libsambalibs} = %{EVRD}
%description -n %{libndr}
Network Data Representation library from Samba4.
@ -1035,6 +1044,7 @@ Network Data Representation library from Samba4.
Summary: Development files for Network Data Representation library from Samba4
Group: Development/C
Requires: %{libndr} = %{EVRD}
Requires: samba-devel = %{EVRD}
Provides: ndr-devel = %{EVRD}
%description -n %{ndrdevel}
@ -1049,6 +1059,7 @@ Development files for Network Data Representation library from Samba4.
%package -n %{libsambahostconfig}
Summary: Samba4's host configuration library
Group: System/Libraries
Requires: %{libsambalibs} = %{EVRD}
%description -n %{libsambahostconfig}
Samba4's host configuration library.
@ -1062,6 +1073,7 @@ Samba4's host configuration library.
Summary: Samba4's host configuration library
Group: Development/C
Requires: %{libsambahostconfig} = %{EVRD}
Requires: samba-devel = %{EVRD}
Provides: samba-hostconfig-devel = %{EVRD}
%description -n %{sambahostconfigdevel}
@ -1076,6 +1088,7 @@ Samba4's host configuration library.
%package -n %{libwbclient}
Summary: Library providing access to winbindd
Group: System/Libraries
Requires: %{libsambalibs} = %{EVRD}
%description -n %{libwbclient}
Library providing access to winbindd.
@ -1089,6 +1102,7 @@ Library providing access to winbindd.
Summary: Library providing access to winbindd
Group: Development/C
Requires: %{libwbclient} = %{EVRD}
Requires: samba-devel = %{EVRD}
Provides: wbclient-devel = %{EVRD}
%description -n %{wbclientdevel}
@ -1104,6 +1118,7 @@ Library providing access to winbindd.
%package -n %{libsambautil}
Summary: Samba4 utility library
Group: System/Libraries
Requires: %{libsambalibs} = %{EVRD}
%description -n %{libsambautil}
Samba4 utility library.
@ -1117,19 +1132,23 @@ Samba4 utility library.
Summary: Development files for Samba4 utility library
Group: Development/C
Requires: %{libsambautil} = %{EVRD}
Requires: samba-devel = %{EVRD}
Provides: samba-util-devel = %{EVRD}
Obsoletes: samba-devel < 1:4.10.4
%description -n %{sambautildevel}
Development files for Samba4 utility library.
%files -n %{sambautildevel}
%{_libdir}/libsamba-util.so
%{_libdir}/pkgconfig/samba-util.pc
#----------------------------------------------------------------------------
%package -n %{libpolicy}
Summary: Samba4 policy library
Group: System/Libraries
Requires: %{libsambalibs} = %{EVRD}
%description -n %{libpolicy}
Samba4 policy library.
@ -1143,6 +1162,7 @@ Samba4 policy library.
Summary: Development files for Samba4 policy library
Group: Development/C
Requires: %{libpolicy} = %{EVRD}
Requires: samba-devel = %{EVRD}
Provides: policy-devel = %{EVRD}
%description -n %{libpolicydevel}
@ -1157,6 +1177,7 @@ Development files for Samba4 policy library.
%package -n %{libsamdb}
Summary: Samba4 samdb library
Group: System/Libraries
Requires: %{libsambalibs} = %{EVRD}
%description -n %{libsamdb}
Samba4 samdb library.
@ -1170,6 +1191,7 @@ Samba4 samdb library.
Summary: Development files for Samba4 samdb library
Group: Development/C
Requires: %{libsamdb} = %{EVRD}
Requires: samba-devel = %{EVRD}
Provides: samdb-devel = %{EVRD}
%description -n %{libsamdbdevel}
@ -1184,6 +1206,7 @@ Development files for Samba4 samdb library.
%package -n %{libsambapassdb}
Summary: Library for working with the Samba user database
Group: System/Libraries
Requires: %{libsambalibs} = %{EVRD}
Obsoletes: %{_lib}pdb0 < 1:4.3.1
%description -n %{libsambapassdb}
@ -1197,6 +1220,7 @@ Library for working with the Samba user database.
%package -n %{libcredentials}
Summary: Library for working with Samba credentials
Group: System/Libraries
Requires: %{libsambalibs} = %{EVRD}
%description -n %{libcredentials}
Library for working with Samba credentials.
@ -1210,6 +1234,7 @@ Library for working with Samba credentials.
%package -n %{libsmbconf}
Summary: Library for working with Samba config files
Group: System/Libraries
Requires: %{libsambalibs} = %{EVRD}
%description -n %{libsmbconf}
Library for working with Samba config files.
@ -1223,7 +1248,8 @@ Library for working with Samba config files.
Summary: Samba LDAP library
Group: System/Libraries
# due to libsmbldap.so.* depending from private libs in %%{_libdir}/samba/
Obsoletes: %{_lib}smbldap0 < 1:4.9
Obsoletes: %{_lib}smbldap0 < 1:4.
Requires: %{libsambalibs} = %{EVRD}
%description -n %{libsmbldap}
Samba LDAP library.
@ -1236,6 +1262,7 @@ Samba LDAP library.
%package -n %{libtevent_util}
Summary: Utility library for working with the Tevent library
Group: System/Libraries
Requires: %{libsambalibs} = %{EVRD}
%description -n %{libtevent_util}
Utility library for working with the Tevent library.
@ -1249,6 +1276,7 @@ Utility library for working with the Tevent library.
%package passdb-mysql
Summary: Samba password database plugin for MySQL
Group: System/Libraries
Requires: %{libsambalibs} = %{EVRD}
%description passdb-mysql
The passdb-mysql package for samba provides a password database backend
@ -1295,6 +1323,7 @@ using the cifs filesystem driver.
%package -n %{libsambaerrors}
Summary: Samba errors library
Group: System/Libraries
Requires: %{libsambalibs} = %{EVRD}
%description -n %{libsambaerrors}
Samba errors library.