packaging(RHEL-CTDB): fix location of nsswitch/ directory for install

This has been moved to the top level directory in 3.4.

Michael
(cherry picked from commit 5bfcde9f41a87d20490d2d94342892becf90383a)

diff --git a/packaging/RHEL-CTDB/samba.spec.tmpl b/packaging/RHEL-CTDB/samba.spec.tmpl
index f907cda7df2ffb4ce0c25fca217f9da36dc7ee17..290bb993a69177448713b898b019484eca1600be 100644 (file)
--- a/packaging/RHEL-CTDB/samba.spec.tmpl
+++ b/packaging/RHEL-CTDB/samba.spec.tmpl
@@ -205,7 +205,7 @@ make %{?_smp_mflags} \
 rm -rf %{_32bit_tmp_dir}
 mkdir %{_32bit_tmp_dir}
 
-mv nsswitch/libnss_winbind.so %{_32bit_tmp_dir}/
+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}/
@@ -300,14 +300,14 @@ make DESTDIR=$RPM_BUILD_ROOT \
 cd ..
 
 # NSS winbind support
-install -m 755 source3/nsswitch/libnss_winbind.so $RPM_BUILD_ROOT/%{_libarch}/libnss_winbind.so.2
+install -m 755 nsswitch/libnss_winbind.so $RPM_BUILD_ROOT/%{_libarch}/libnss_winbind.so.2
 ( cd $RPM_BUILD_ROOT/%{_libarch};
   ln -sf libnss_winbind.so.2  libnss_winbind.so )
 #
 # do not install libnss_wins.so in order to reduce dependencies
 # (we do not need it for the samba-ctdb scenario)
 #
-#install -m 755 source3/nsswitch/libnss_wins.so $RPM_BUILD_ROOT/%{_libarch}/libnss_wins.so
+#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 )