Revert the strict dependencies to samba-common(-tools).

These cause python2 to be pulled in by default installations.

Guenther
This commit is contained in:
Günther Deschner 2015-12-15 12:45:08 +01:00
parent 374aae79e8
commit be78e92162

View File

@ -6,7 +6,7 @@
# ctdb is enabled by default, you can disable it with: --without clustering # ctdb is enabled by default, you can disable it with: --without clustering
%bcond_without clustering %bcond_without clustering
%define main_release 1 %define main_release 2
%define samba_version 4.3.2 %define samba_version 4.3.2
%define talloc_version 2.1.3 %define talloc_version 2.1.3
@ -117,7 +117,6 @@ Requires(preun): systemd
Requires(postun): systemd Requires(postun): systemd
Requires(pre): %{name}-common = %{samba_depver} Requires(pre): %{name}-common = %{samba_depver}
Requires: %{name}-common = %{samba_depver}
Requires: %{name}-common-libs = %{samba_depver} Requires: %{name}-common-libs = %{samba_depver}
Requires: %{name}-common-tools = %{samba_depver} Requires: %{name}-common-tools = %{samba_depver}
Requires: %{name}-client-libs = %{samba_depver} Requires: %{name}-client-libs = %{samba_depver}
@ -231,7 +230,6 @@ Samba is the standard Windows interoperability suite of programs for Linux and U
Summary: Samba client programs Summary: Samba client programs
Group: Applications/System Group: Applications/System
Requires(pre): %{name}-common = %{samba_depver} Requires(pre): %{name}-common = %{samba_depver}
Requires: %{name}-common = %{samba_depver}
Requires: %{name}-common-libs = %{samba_depver} Requires: %{name}-common-libs = %{samba_depver}
Requires: %{name}-client-libs = %{samba_depver} Requires: %{name}-client-libs = %{samba_depver}
%if %with_libsmbclient %if %with_libsmbclient
@ -251,7 +249,6 @@ of SMB/CIFS shares and printing to SMB/CIFS printers.
Summary: Samba client libraries Summary: Samba client libraries
Group: Applications/System Group: Applications/System
Requires(pre): %{name}-common = %{samba_depver} Requires(pre): %{name}-common = %{samba_depver}
Requires: %{name}-common = %{samba_depver}
%if %with_libwbclient %if %with_libwbclient
Requires: libwbclient = %{samba_depver} Requires: libwbclient = %{samba_depver}
%endif %endif
@ -267,7 +264,6 @@ Group: Applications/System
BuildArch: noarch BuildArch: noarch
Requires(post): systemd Requires(post): systemd
Requires: samba-common-tools = %{samba_depver}
Provides: samba4-common = %{samba_depver} Provides: samba4-common = %{samba_depver}
Obsoletes: samba4-common < %{samba_depver} Obsoletes: samba4-common < %{samba_depver}
@ -281,7 +277,6 @@ packages of Samba.
Summary: Libraries used by both Samba servers and clients Summary: Libraries used by both Samba servers and clients
Group: Applications/System Group: Applications/System
Requires(pre): samba-common = %{samba_depver} Requires(pre): samba-common = %{samba_depver}
Requires: samba-common = %{samba_depver}
Requires: %{name}-client-libs = %{samba_depver} Requires: %{name}-client-libs = %{samba_depver}
%if %with_libwbclient %if %with_libwbclient
Requires: libwbclient = %{samba_depver} Requires: libwbclient = %{samba_depver}
@ -403,7 +398,6 @@ link against the SMB, RPC and other protocols provided by the Samba suite.
Summary: The SMB client library Summary: The SMB client library
Group: Applications/System Group: Applications/System
Requires(pre): %{name}-common = %{samba_depver} Requires(pre): %{name}-common = %{samba_depver}
Requires: %{name}-common = %{samba_depver}
Requires: %{name}-client-libs = %{samba_depver} Requires: %{name}-client-libs = %{samba_depver}
%description -n libsmbclient %description -n libsmbclient
@ -529,7 +523,6 @@ packages of Samba.
Summary: Samba winbind Summary: Samba winbind
Group: Applications/System Group: Applications/System
Requires(pre): %{name}-common = %{samba_depver} Requires(pre): %{name}-common = %{samba_depver}
Requires: %{name}-common = %{samba_depver}
Requires: %{name}-common-libs = %{samba_depver} Requires: %{name}-common-libs = %{samba_depver}
Requires: %{name}-common-tools = %{samba_depver} Requires: %{name}-common-tools = %{samba_depver}
Requires: %{name}-client-libs = %{samba_depver} Requires: %{name}-client-libs = %{samba_depver}
@ -1989,6 +1982,9 @@ rm -rf %{buildroot}
%endif # with_clustering_support %endif # with_clustering_support
%changelog %changelog
* Tue Dec 15 2015 Guenther Deschner <gdeschner@redhat.com> - 4.3.2-2
- revert dependencies to samba-common and -tools
* Tue Dec 01 2015 Guenther Deschner <gdeschner@redhat.com> - 4.3.2-1 * Tue Dec 01 2015 Guenther Deschner <gdeschner@redhat.com> - 4.3.2-1
- resolves: #1261230 - Update to Samba 4.3.2 - resolves: #1261230 - Update to Samba 4.3.2