diff --git a/samba.spec b/samba.spec index 41034a9..ab6f898 100644 --- a/samba.spec +++ b/samba.spec @@ -1,7 +1,7 @@ # Set --with testsuite or %bcond_without to run the Samba torture testsuite. %bcond_with testsuite -%define main_release 1 +%define main_release 2 %define samba_version 4.0.9 %define talloc_version 2.0.7 @@ -413,20 +413,18 @@ domains and to use Windows user and group accounts on Linux. %package winbind-clients Summary: Samba winbind clients Group: Applications/System -Requires: %{name}-common = %{samba_depver} Requires: %{name}-libs = %{samba_depver} Requires: %{name}-winbind = %{samba_depver} %if %with_libwbclient Requires: libwbclient = %{samba_depver} %endif -Requires: pam Provides: samba4-winbind-clients = %{samba_depver} Obsoletes: samba4-winbind-clients < %{samba_depver} %description winbind-clients -The samba-winbind-clients package provides the NSS library and a PAM -module necessary to communicate to the Winbind Daemon +The samba-winbind-clients package provides the wbinfo and ntlm_auth +tool. ### WINBIND-KRB5-LOCATOR %package winbind-krb5-locator @@ -455,6 +453,20 @@ Requires(preun): %{_sbindir}/update-alternatives The winbind krb5 locator is a plugin for the system kerberos library to allow the local kerberos library to use the same KDC as samba and winbind use +### WINBIND-MODULES +%package winbind-modules +Summary: Samba winbind modules +Group: Applications/System +Requires: %{name}-libs = %{samba_depver} +%if %with_libwbclient +Requires: libwbclient = %{samba_depver} +%endif +Requires: pam + +%description winbind-modules +The samba-winbind-modules package provides the NSS library and a PAM +module necessary to communicate to the Winbind Daemon + %prep %setup -q -n samba-%{version}%{pre_release} @@ -709,10 +721,6 @@ fi %systemd_postun_with_restart smb.service %systemd_postun_with_restart nmb.service -%post winbind-clients -p /sbin/ldconfig - -%postun winbind-clients -p /sbin/ldconfig - %postun winbind-krb5-locator if [ "$1" -ge "1" ]; then if [ "`readlink %{_sysconfdir}/alternatives/winbind_krb5_locator.so`" == "%{_libdir}/winbind_krb5_locator.so" ]; then @@ -729,6 +737,10 @@ if [ $1 -eq 0 ]; then %{_sbindir}/update-alternatives --remove winbind_krb5_locator.so %{_libdir}/winbind_krb5_locator.so fi +%post winbind-modules -p /sbin/ldconfig + +%postun winbind-modules -p /sbin/ldconfig + %clean rm -rf %{buildroot} @@ -1491,14 +1503,8 @@ rm -rf %{buildroot} %defattr(-,root,root) %{_bindir}/ntlm_auth %{_bindir}/wbinfo -%{_libdir}/libnss_winbind.so* -%{_libdir}/libnss_wins.so* -%{_libdir}/security/pam_winbind.so -%config(noreplace) %{_sysconfdir}/security/pam_winbind.conf %{_mandir}/man1/ntlm_auth.1.gz %{_mandir}/man1/wbinfo.1* -%{_mandir}/man5/pam_winbind.conf.5* -%{_mandir}/man8/pam_winbind.8* ### WINBIND-KRB5-LOCATOR %files winbind-krb5-locator @@ -1507,7 +1513,20 @@ rm -rf %{buildroot} %{_libdir}/winbind_krb5_locator.so %{_mandir}/man7/winbind_krb5_locator.7* +### WINBIND-MODULES +%files winbind-modules +%defattr(-,root,root) +%{_libdir}/libnss_winbind.so* +%{_libdir}/libnss_wins.so* +%{_libdir}/security/pam_winbind.so +%config(noreplace) %{_sysconfdir}/security/pam_winbind.conf +%{_mandir}/man5/pam_winbind.conf.5* +%{_mandir}/man8/pam_winbind.8* + %changelog +* Fri Oct 04 2013 - Andreas Schneider - 2:4.0.9-2 +- resolves: #1010722 - Split out a samba-winbind-modules package. + * Tue Aug 20 2013 - Guenther Deschner 2:4.0.9-1 - Update to Samba 4.0.9