[samba4] Add more Requires found by rpmdiff.
asn
asn at fedoraproject.org
Fri Sep 21 12:17:19 UTC 2012
commit 5aa6efd87ec07f6d8f241a846f0055b395a7f201
Author: Andreas Schneider <asn at cryptomilk.org>
Date: Fri Sep 21 14:11:09 2012 +0200
Add more Requires found by rpmdiff.
samba4.spec | 36 ++++++++++++++++++++++++++----------
1 files changed, 26 insertions(+), 10 deletions(-)
---
diff --git a/samba4.spec b/samba4.spec
index 8926be1..47cd8d4 100644
--- a/samba4.spec
+++ b/samba4.spec
@@ -115,6 +115,8 @@ Requires(preun): /sbin/chkconfig, /sbin/service
%endif
Requires(pre): %{name}-common = %{samba_depver}
+Requires: %{name}-libs = %{samba_depver}
+
Requires: logrotate
Requires: pam
Requires: perl(Parse::Yapp)
@@ -219,6 +221,7 @@ link against the SMB, RPC and other protocols provided by the Samba suite.
%package python
Summary: Samba Python libraries
Group: Applications/System
+Requires: %{name} = %{samba_depver}
Requires: %{name}-libs = %{samba_depver}
%description python
@@ -228,6 +231,7 @@ that use SMB, RPC and other Samba provided protocols in Python programs.
%package devel
Summary: Developer tools for Samba libraries
Group: Development/Libraries
+Requires: %{name}-common = %{samba_depver}
Requires: %{name}-libs = %{samba_depver}
Conflicts: samba-devel < %{samba_conflict_ver}
@@ -265,6 +269,10 @@ packages of Samba.
%package test
Summary: Testing tools for Samba servers and clients
Group: Applications/System
+Requires: %{name} = %{samba_depver}
+Requires: %{name}-common = %{samba_depver}
+Requires: %{name}-dc = %{samba_depver}
+Requires: %{name}-libs = %{samba_depver}
%description test
samba4-test provides testing tools for both the server and client
@@ -273,8 +281,8 @@ packages of Samba.
%package winbind
Summary: Samba winbind
Group: Applications/System
-Requires: %{name} = %{samba_depver}
-Requires: samba4-common = %{samba_depver}
+Requires: %{name}-common = %{samba_depver}
+Requires: %{name}-libs = %{samba_depver}
Conflicts: samba-winbind < %{samba_conflict_ver}
Provides: samba-winbind = %{samba_depver}
@@ -286,8 +294,10 @@ domains and to use Windows user and group accounts on Linux.
%package winbind-krb5-locator
Summary: Samba winbind krb5 locator
-Requires: %{name}-winbind-clients = %{samba_depver}
Group: Applications/System
+%if %with_libwbclient
+Requires: libwbclient
+%endif
Conflicts: samba-winbind-krb5-locator < %{samba_depver}
Provides: samba-winbind-krb5-locator = %{samba_depver}
@@ -299,6 +309,8 @@ the local kerberos library to use the same KDC as samba and winbind use
%package winbind-clients
Summary: Samba winbind clients
Group: Applications/System
+Requires: %{name}-common = %{samba_depver}
+Requires: %{name}-libs = %{samba_depver}
%if %with_libwbclient
Requires: libwbclient
%endif
@@ -313,7 +325,10 @@ module necessary to communicate to the Winbind Daemon
%package swat
Summary: The Samba SMB server Web configuration program
Group: Applications/System
-Requires: %{name} = %{samba_depver}, xinetd
+Requires: %{name} = %{samba_depver}
+Requires: %{name}-common = %{samba_depver}
+Requires: %{name}-libs = %{samba_depver}
+Requires: xinetd
Conflicts: samba-swat < %{samba_conflict_ver}
Provides: samba-swat = %{samba_depver}
@@ -368,8 +383,9 @@ The libwbclient-devel package provides developer tools for the wbclient library.
%package dc
Summary: Samba AD Domain Controller
Group: Applications/System
-Requires: samba4-dc-libs = %{samba_depver}
-Requires: samba4-python = %{samba_depver}
+Requires: %{name}-libs = %{samba_depver}
+Requires: %{name}-dc-libs = %{samba_depver}
+Requires: %{name}-python = %{samba_depver}
%description dc
The samba-dc package provides AD Domain Controller functionality
@@ -377,8 +393,8 @@ The samba-dc package provides AD Domain Controller functionality
%package dc-libs
Summary: Samba AD Domain Controller Libraries
Group: Applications/System
-Requires: samba4-libs = %{samba_depver}
-Requires: samba4-common = %{samba_depver}
+Requires: %{name}-common = %{samba_depver}
+Requires: %{name}-libs = %{samba_depver}
%description dc-libs
The samba4-dc-libs package contains the libraries needed by the DC to
@@ -837,6 +853,7 @@ rm -rf %{buildroot}
%{_libdir}/samba/libcli-nbt.so
%{_libdir}/samba/libcli_cldap.so
%{_libdir}/samba/libcli_smb_common.so
+%{_libdir}/samba/libcli_spoolss.so
%{_libdir}/samba/libcliauth.so
#%{_libdir}/samba/libclidns.so
%{_libdir}/samba/libcluster.so
@@ -879,6 +896,7 @@ rm -rf %{buildroot}
%{_libdir}/samba/libsmbregistry.so
%{_libdir}/samba/libtdb-wrap.so
%{_libdir}/samba/libtdb_compat.so
+%{_libdir}/samba/libtrusts_util.so
%{_libdir}/samba/libutil_cmdline.so
#%{_libdir}/samba/libutil_ntdb.so
%{_libdir}/samba/libutil_reg.so
@@ -1096,9 +1114,7 @@ rm -rf %{buildroot}
%{_bindir}/smbta-util
%{_bindir}/smbtree
%{_bindir}/split_tokens
-%{_libdir}/samba/libcli_spoolss.so
%{_libdir}/samba/libldb-cmdline.so
-%{_libdir}/samba/libtrusts_util.so
%{_mandir}/man1/nmblookup.1*
%{_mandir}/man1/oLschema2ldif.1*
%{_mandir}/man1/regdiff.1*
More information about the scm-commits
mailing list