packaging(RHEL-CTDB): move the idmap and nss_info modules to the common package

[abartlet/samba.git/.git] / packaging / RHEL-CTDB / samba.spec.tmpl

diff --git a/packaging/RHEL-CTDB/samba.spec.tmpl b/packaging/RHEL-CTDB/samba.spec.tmpl
index 290bb993a69177448713b898b019484eca1600be..a84a5cfce22aab888658f2a4ecfe0d26ebbbcb6a 100644 (file)
--- a/packaging/RHEL-CTDB/samba.spec.tmpl
+++ b/packaging/RHEL-CTDB/samba.spec.tmpl
@@ -185,7 +185,8 @@ CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -m32" ./configure \
        --with-ctdb=/usr/include \
        --without-ldb \
        --without-dnsupdate \
-       --with-aio-support
+       --with-aio-support \
+       --disable-merged-build
 
 make showlayout
 
@@ -209,6 +210,7 @@ mv ../nsswitch/libnss_winbind.so %{_32bit_tmp_dir}/
 mv bin/pam_winbind.so %{_32bit_tmp_dir}/
 mv bin/libtalloc.so* %{_32bit_tmp_dir}/
 mv bin/libtdb.so* %{_32bit_tmp_dir}/
+mv bin/libwbclient.so* %{_32bit_tmp_dir}/
 
 make clean
 
@@ -248,7 +250,8 @@ CFLAGS="$RPM_OPT_FLAGS $EXTRA -D_GNU_SOURCE" ./configure \
        --with-ctdb=/usr/include \
        --without-ldb \
        --without-dnsupdate \
-       --with-aio-support
+       --with-aio-support\
+       --disable-merged-build
 
 make showlayout
 
@@ -293,6 +296,7 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/{samba,sysconfig}
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d
 mkdir -p $RPM_BUILD_ROOT/var/lib/samba/winbindd_privileged
 mkdir -p $RPM_BUILD_ROOT/var/{log,run/winbindd,spool}/samba
+mkdir -p $RPM_BUILD_ROOT/%{_libarchdir}/krb5/plugins/libkrb5
 
 cd source3
 make DESTDIR=$RPM_BUILD_ROOT \
@@ -310,6 +314,7 @@ install -m 755 nsswitch/libnss_winbind.so $RPM_BUILD_ROOT/%{_libarch}/libnss_win
 #install -m 755 nsswitch/libnss_wins.so $RPM_BUILD_ROOT/%{_libarch}/libnss_wins.so
 # ( cd $RPM_BUILD_ROOT/%{_libarch}; ln -sf libnss_wins.so  libnss_wins.so.2 )
 
+cp -p source3/bin/winbind_krb5_locator.so ${RPM_BUILD_ROOT}/%{_libarchdir}/krb5/plugins/libkrb5
 
 # install files for winbind-32bit package
 %ifarch x86_64 ppc64
@@ -319,6 +324,7 @@ install -m 755 %{_32bit_tmp_dir}/libnss_winbind.so ${RPM_BUILD_ROOT}/lib/libnss_
 
 mv %{_32bit_tmp_dir}/libtalloc* ${RPM_BUILD_ROOT}/usr/lib
 mv %{_32bit_tmp_dir}/libtdb* ${RPM_BUILD_ROOT}/usr/lib
+mv %{_32bit_tmp_dir}/libwbclient* ${RPM_BUILD_ROOT}/usr/lib
 mv %{_32bit_tmp_dir}/pam_winbind.so ${RPM_BUILD_ROOT}/lib/security
 
 rm -rf %{_32bit_tmp_dir}
@@ -450,8 +456,6 @@ exit 0
 %{_bindir}/tdbdump
 %{_bindir}/eventlogadm
 
-%{_libarchdir}/samba/idmap/*.so
-%{_libarchdir}/samba/nss_info/*.so
 %{_libarchdir}/samba/vfs/*.so
 %{_libarchdir}/samba/auth/*.so
 
@@ -468,7 +472,6 @@ exit 0
 %{_mandir}/man8/tdbtool.8*
 %{_mandir}/man8/eventlogadm.8*
 %{_mandir}/man8/vfs_*.8*
-%{_mandir}/man8/idmap_*.8*
 
 
 ##########
@@ -511,6 +514,7 @@ exit 0
 %{_bindir}/smbspool
 %{_bindir}/smbtar
 %{_bindir}/smbtree
+%{_bindir}/sharesec
 
 %{_mandir}/man8/mount.cifs.8.*
 %{_mandir}/man8/umount.cifs.8.*
@@ -525,6 +529,7 @@ exit 0
 %{_mandir}/man1/smbclient.1*
 %{_mandir}/man1/smbtar.1*
 %{_mandir}/man1/smbtree.1*
+%{_mandir}/man1/sharesec.1*
 
 ##########
 
@@ -541,6 +546,10 @@ exit 0
 %attr(755,root,root) /%{_libarch}/libnss_winbind.so*
 %attr(755,root,root) /%{_libarch}/security/pam_winbind.so
 %attr(755,root,root) /%{_libarch}/security/pam_smbpass.so
+/usr/share/locale/de/LC_MESSAGES/pam_winbind.mo
+
+%{_libarchdir}/samba/idmap/*.so
+%{_libarchdir}/samba/nss_info/*.so
 
 %{_includedir}/libsmbclient.h
 %{_libarchdir}/libsmbclient.*
@@ -561,6 +570,8 @@ exit 0
 %{_libarchdir}/libtdb.so*
 %{_libarchdir}/libwbclient.so*
 
+%{_libarchdir}/krb5/plugins/libkrb5/winbind_krb5_locator.so
+
 %{_sbindir}/winbind
 
 %{_sbindir}/winbindd
@@ -573,6 +584,7 @@ exit 0
 %{_bindir}/ldbedit
 %{_bindir}/ldbmodify
 %{_bindir}/ldbsearch
+%{_bindir}/ldbrename
 %{_bindir}/wbinfo
 %{_bindir}/ntlm_auth
 %{_bindir}/pdbedit
@@ -588,13 +600,16 @@ exit 0
 %{_mandir}/man1/wbinfo.1*
 %{_mandir}/man8/winbindd.8*
 %{_mandir}/man8/net.8*
-%{_mandir}/man7/pam_winbind.7*
+%{_mandir}/man8/pam_winbind.8*
 %{_mandir}/man7/libsmbclient.7*
 %{_mandir}/man1/ldbadd.1*
 %{_mandir}/man1/ldbdel.1*
 %{_mandir}/man1/ldbedit.1*
 %{_mandir}/man1/ldbmodify.1*
 %{_mandir}/man1/ldbsearch.1*
+%{_mandir}/man1/ldbrename.1*
+%{_mandir}/man7/winbind_krb5_locator.7*
+%{_mandir}/man8/idmap_*.8*
 
 %ifarch x86_64 ppc64
 %files winbind-32bit
@@ -602,6 +617,7 @@ exit 0
 #%attr(755,root,root) /lib/libnss_wins.so*
 %attr(755,root,root) /usr/lib/libtalloc.so*
 %attr(755,root,root) /usr/lib/libtdb.so*
+%attr(755,root,root) /usr/lib/libwbclient.so*
 %attr(755,root,root) /lib/security/pam_winbind.so
 %endif