summaryrefslogtreecommitdiffstats
path: root/packaging
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2009-06-29 17:07:14 +0200
committerKarolin Seeger <kseeger@samba.org>2009-11-26 11:40:49 +0100
commit5bb27ef167e88f02073ac7c87683ef40e8cd5d67 (patch)
treefeda67938220aba071aaff85e686f20dbb9fb9db /packaging
parented37ea388f6ef6c3a84ef7873bab469099effb3b (diff)
downloadsamba-5bb27ef167e88f02073ac7c87683ef40e8cd5d67.tar.gz
samba-5bb27ef167e88f02073ac7c87683ef40e8cd5d67.tar.xz
samba-5bb27ef167e88f02073ac7c87683ef40e8cd5d67.zip
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)
Diffstat (limited to 'packaging')
-rw-r--r--packaging/RHEL-CTDB/samba.spec.tmpl6
1 files changed, 3 insertions, 3 deletions
diff --git a/packaging/RHEL-CTDB/samba.spec.tmpl b/packaging/RHEL-CTDB/samba.spec.tmpl
index f907cda7df2..290bb993a69 100644
--- 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 )