[samba4/f17] Move some binaries and libraries to right subpackage.

asn asn at fedoraproject.org
Mon May 21 09:26:10 UTC 2012


commit 65da7cbebbe013f76e02fe4446355b6eafc6d8d9
Author: Andreas Schneider <asn at cryptomilk.org>
Date:   Mon May 21 11:25:10 2012 +0200

    Move some binaries and libraries to right subpackage.

 samba4.spec |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)
---
diff --git a/samba4.spec b/samba4.spec
index 73481ea..c530e41 100644
--- a/samba4.spec
+++ b/samba4.spec
@@ -1,4 +1,4 @@
-%define main_release 49
+%define main_release 50
 
 %define samba_version 4.0.0
 %define talloc_version 2.0.7
@@ -118,6 +118,7 @@ BuildRequires: perl(ExtUtils::MakeMaker)
 BuildRequires: perl(Parse::Yapp)
 BuildRequires: popt-devel
 BuildRequires: python-devel
+BuildRequires: python-tevent
 BuildRequires: quota-devel
 BuildRequires: readline-devel
 BuildRequires: sed
@@ -662,7 +663,6 @@ rm -rf %{buildroot}
 %{_libdir}/samba/libsmbd_base.so
 %{_libdir}/samba/libsmbd_conn.so
 %{_libdir}/samba/auth
-%{_libdir}/samba/idmap
 %{_libdir}/samba/vfs
 %if 0%{?fedora} > 15 || 0%{?rhel} > 6
 %{_unitdir}/nmb.service
@@ -876,12 +876,12 @@ rm -rf %{buildroot}
 
 %files winbind
 %defattr(-,root,root)
-%{_bindir}/ntlm_auth3
 #%{_bindir}/wbinfo3
 %{_libdir}/samba/idmap
 %{_libdir}/samba/nss_info
 %{_libdir}/samba/libnss_info.so
 %{_libdir}/samba/libidmap.so
+%{_libdir}/samba/idmap
 %{_sbindir}/winbindd
 %ghost %dir /var/run/winbindd
 %attr(750,root,wbpriv) %dir /var/lib/samba/winbindd_privileged
@@ -889,7 +889,6 @@ rm -rf %{buildroot}
 %if 0%{?fedora} > 15 || 0%{?rhel} > 6
 %{_unitdir}/winbind.service
 %endif
-#%{_mandir}/man1/ntlm_auth.1*
 #%{_mandir}/man1/wbinfo.1*
 #%{_mandir}/man5/pam_winbind.conf.5*
 #%{_mandir}/man8/pam_winbind.8*
@@ -907,12 +906,15 @@ rm -rf %{buildroot}
 
 %files winbind-clients
 %defattr(-,root,root)
+%{_bindir}/ntlm_auth
+%{_bindir}/ntlm_auth3
 %{_bindir}/wbinfo
 %{_libdir}/libnss_winbind.so
 /%{smb_lib}/libnss_winbind.so.2
 %{_libdir}/libnss_wins.so
 /%{smb_lib}/libnss_wins.so.2
 /%{smb_lib}/security/pam_winbind.so
+%{_mandir}/man1/ntlm_auth.1.gz
 
 %files client
 %defattr(-,root,root)
@@ -924,8 +926,6 @@ rm -rf %{buildroot}
 %{_bindir}/net
 %{_bindir}/nmblookup
 %{_bindir}/nmblookup3
-%{_bindir}/ntlm_auth
-%{_bindir}/ntlm_auth3
 %{_bindir}/oLschema2ldif
 %{_bindir}/pdbedit
 %{_bindir}/profiles
@@ -952,7 +952,6 @@ rm -rf %{buildroot}
 %{_libdir}/samba/libldb-cmdline.so
 %{_libdir}/samba/libtrusts_util.so
 %{_mandir}/man1/nmblookup.1.gz
-%{_mandir}/man1/ntlm_auth.1.gz
 %{_mandir}/man1/oLschema2ldif.1.gz
 %{_mandir}/man1/regdiff.1.gz
 %{_mandir}/man1/regpatch.1.gz
@@ -1226,6 +1225,12 @@ rm -rf %{buildroot}
 %endif # with_libwbclient
 
 %changelog
+* Mon May 21 2012 Andreas Schneider <asn at redhat.com> - 2:4.0.0-50.alpha18
+- Add missing python-tevent to BuildRequires.
+- Move idmap modlues to winbind package.
+- Move ntlm_auth to winbind-clients package.
+- resolves: #823182
+
 * Mon May 14 2012 Andreas Schneider <asn at redhat.com> - 2:4.0.0-49.alpha18
 - Move tmpfiles.d config to common package as it is needed for smbd and
   winbind.


More information about the scm-commits mailing list