From c53de396235d4d606fddab2a9be48fc318ef00c7 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Mon, 29 Jun 2009 17:07:14 +0200 Subject: [PATCH 1/1] packaging(RHEL-CTDB): fix location of nsswitch/ directory for install This has been moved to the top level directory in 3.4. Michael --- packaging/RHEL-CTDB/samba.spec.tmpl | 6 +++--- 1 file 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 ) -- 2.34.1