summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2007-03-21 15:55:45 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:18:48 -0500
commite17a35e3ea82819da0226d6290b960a63488f02e (patch)
treefbedab37c02d3c9f13487856044127ea3088db1c
parentf8c2960d45df07a252ccb176cc691f5063a5231a (diff)
downloadsamba-e17a35e3ea82819da0226d6290b960a63488f02e.tar.gz
samba-e17a35e3ea82819da0226d6290b960a63488f02e.tar.bz2
samba-e17a35e3ea82819da0226d6290b960a63488f02e.zip
r21908: update with the 3.0.25 packaging
(This used to be commit 3c2c0bb293c35fc6bf8e545768d366b42900e53b)
-rw-r--r--packaging/RHEL/samba.spec.tmpl19
1 files changed, 15 insertions, 4 deletions
diff --git a/packaging/RHEL/samba.spec.tmpl b/packaging/RHEL/samba.spec.tmpl
index 5fdc808108..8235cb1d9e 100644
--- a/packaging/RHEL/samba.spec.tmpl
+++ b/packaging/RHEL/samba.spec.tmpl
@@ -233,6 +233,14 @@ install -m 644 source/include/libmsrpc.h $RPM_BUILD_ROOT%{_includedir}
rm -f $RPM_BUILD_ROOT%{_libdir}/samba/libmsrpc.*
ln -s /%{_libdir}/libmsrpc.so $RPM_BUILD_ROOT%{_libdir}/libmsrpc.so.0
+# make install puts libsmbsharemodes.so in the wrong place on x86_64
+rm -f $RPM_BUILD_ROOT/usr/lib*/samba/libsmbsharemodes.so $RPM_BUILD_ROOT/usr/lib*/samba/libsmbsharemodes.a || true
+install -m 755 source/bin/libsmbsharemodes.so $RPM_BUILD_ROOT%{_libdir}/libsmbsharemodes.so
+install -m 755 source/bin/libsmbsharemodes.a $RPM_BUILD_ROOT%{_libdir}/libsmbsharemodes.a
+install -m 644 source/include/smb_share_modes.h $RPM_BUILD_ROOT%{_includedir}
+rm -f $RPM_BUILD_ROOT%{_libdir}/samba/libsmbsharemodes.*
+ln -s /%{_libdir}/libsmbsharemodes.so $RPM_BUILD_ROOT%{_libdir}/libsmbsharemodes.so.0
+
# Install pam_smbpass.so
install -m755 source/bin/pam_smbpass.so $RPM_BUILD_ROOT/%{_lib}/security/pam_smbpass.so
@@ -376,9 +384,12 @@ fi
%{_mandir}/man8/smbd.8*
%{_mandir}/man8/tdbbackup.8*
%{_mandir}/man8/tdbdump.8*
+%{_mandir}/man8/tdbtool.8*
+%{_mandir}/man8/eventlogadm.8*
%{_mandir}/man8/winbindd.8*
%{_mandir}/man1/ntlm_auth.1*
%{_mandir}/man1/wbinfo.1*
+%{_mandir}/man8/vfs_*.8*
##########
@@ -462,11 +473,11 @@ fi
%attr(755,root,root) /%{_lib}/security/pam_smbpass.so
%{_includedir}/libsmbclient.h
-%{_libdir}/libsmbclient.a
-%{_libdir}/libsmbclient.so*
+%{_libdir}/libsmbclient.*
%{_includedir}/libmsrpc.h
-%{_libdir}/libmsrpc.a
-%{_libdir}/libmsrpc.so*
+%{_libdir}/libmsrpc.*
+%{_includedir}/smb_share_modes.h
+%{_libdir}/libsmbsharemodes.*
%{_libdir}/samba/*.dat
%{_libdir}/samba/*.msg