rpms/samba
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Move Obsoletes to samba-common-libs package

Browse Source 
As samba-common is a noarch package, this could cause issues.

related: rhbz#1954531
This commit is contained in:
Andreas Schneider 2021-05-31 08:44:24 +02:00
parent 37c848df60
commit 67b57cd948
1 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
samba.spec
View File

@ -108,7 +108,7 @@
%define samba_requires_eq() %(LC_ALL="C" echo '%*' | xargs -r rpm -q --qf 'Requires: %%{name} = %%{epoch}:%%{version}\\n' | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not") %define samba_requires_eq() %(LC_ALL="C" echo '%*' | xargs -r rpm -q --qf 'Requires: %%{name} = %%{epoch}:%%{version}\\n' | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not")
%global baserelease 6 %global baserelease 7
%global samba_version 4.14.4 %global samba_version 4.14.4
%global talloc_version 2.3.2 %global talloc_version 2.3.2
@ -392,31 +392,6 @@ Recommends: logrotate
Provides: samba4-common = %{samba_depver} Provides: samba4-common = %{samba_depver}
Obsoletes: samba4-common < %{samba_depver} Obsoletes: samba4-common < %{samba_depver}
%if %{without dc} && %{without testsuite}
Obsoletes: samba-dc < %{samba_depver}
Obsoletes: samba-dc-libs < %{samba_depver}
Obsoletes: samba-dc-bind-dlz < %{samba_depver}
%endif
# If only build glusterfs for RHGS and Fedora, so obsolete it on other version
# of the distro
%if %{without vfs_glusterfs}
Obsoletes: samba-vfs-glusterfs < %{samba_depver}
# endif without vfs_glusterfs
%endif
# ctdb-tests package has been dropped if we do not build the testsuite
%if %{with clustering}
%if %{without testsuite}
Obsoletes: ctdb-tests < %{samba_depver}
Obsoletes: ctdb-tests-debuginfo < %{samba_depver}
# endif without testsuite
%endif
# endif with clustering
%endif
Provides: bundled(libreplace)
%description common %description common
samba-common provides files necessary for both the server and client samba-common provides files necessary for both the server and client
packages of Samba. packages of Samba.
@ -433,6 +408,29 @@ Requires: libwbclient = %{samba_depver}
Provides: bundled(libreplace) Provides: bundled(libreplace)
%if %{without dc} && %{without testsuite}
Obsoletes: samba-dc < %{samba_depver}
Obsoletes: samba-dc-libs < %{samba_depver}
Obsoletes: samba-dc-bind-dlz < %{samba_depver}
%endif
# ctdb-tests package has been dropped if we do not build the testsuite
%if %{with clustering}
%if %{without testsuite}
Obsoletes: ctdb-tests < %{samba_depver}
Obsoletes: ctdb-tests-debuginfo < %{samba_depver}
# endif without testsuite
%endif
# endif with clustering
%endif
# If only build glusterfs for RHGS and Fedora, so obsolete it on other version
# of the distro
%if %{without vfs_glusterfs}
Obsoletes: samba-vfs-glusterfs < %{samba_depver}
# endif without vfs_glusterfs
%endif
%description common-libs %description common-libs
The samba-common-libs package contains internal libraries needed by the The samba-common-libs package contains internal libraries needed by the
SMB/CIFS clients. SMB/CIFS clients.