svn commit: samba r11126 - in branches/SAMBA_3_0/packaging: Fedora RedHat Solaris

[jerry at samba.org]

Author: jerry
Date: 2005-10-17 16:58:53 +0000 (Mon, 17 Oct 2005)
New Revision: 11126

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=11126

Log:
adding libmsrpc to solaris, redhat, and fedora packaging
Modified:
   branches/SAMBA_3_0/packaging/Fedora/samba.spec.tmpl
   branches/SAMBA_3_0/packaging/RedHat/samba.spec.tmpl
   branches/SAMBA_3_0/packaging/Solaris/makepkg.sh


Changeset:
Modified: branches/SAMBA_3_0/packaging/Fedora/samba.spec.tmpl
===================================================================
--- branches/SAMBA_3_0/packaging/Fedora/samba.spec.tmpl	2005-10-17 16:55:23 UTC (rev 11125)
+++ branches/SAMBA_3_0/packaging/Fedora/samba.spec.tmpl	2005-10-17 16:58:53 UTC (rev 11126)
@@ -196,6 +196,14 @@
 install -m 644 source/include/libsmbclient.h $RPM_BUILD_ROOT%{_includedir}
 rm -f $RPM_BUILD_ROOT%{_libdir}/samba/libsmbclient.*
 
+# make install puts libmsrpc.so in the wrong place on x86_64
+rm -f $RPM_BUILD_ROOT/usr/lib || true
+mkdir -p $RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_includedir}
+install -m 755 source/bin/libmsrpc.so $RPM_BUILD_ROOT%{_libdir}/libmsrpc.so
+install -m 755 source/bin/libmsrpc.a $RPM_BUILD_ROOT%{_libdir}/libmsrpc.a
+install -m 644 source/include/libmsrpc.h $RPM_BUILD_ROOT%{_includedir}
+rm -f $RPM_BUILD_ROOT%{_libdir}/samba/libmsrpc.*
+
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d
 install -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/swat
 

Modified: branches/SAMBA_3_0/packaging/RedHat/samba.spec.tmpl
===================================================================
--- branches/SAMBA_3_0/packaging/RedHat/samba.spec.tmpl	2005-10-17 16:55:23 UTC (rev 11125)
+++ branches/SAMBA_3_0/packaging/RedHat/samba.spec.tmpl	2005-10-17 16:58:53 UTC (rev 11126)
@@ -187,6 +187,11 @@
 install -m 755 source/bin/libsmbclient.a $RPM_BUILD_ROOT%{prefix}/lib/
 install -m 644 source/include/libsmbclient.h $RPM_BUILD_ROOT%{prefix}/include/
 
+# libmsrpc
+install -m 755 source/bin/libmsrpc.so $RPM_BUILD_ROOT%{prefix}/lib/
+install -m 755 source/bin/libmsrpc.a $RPM_BUILD_ROOT%{prefix}/lib/
+install -m 644 source/include/libmsrpc.h $RPM_BUILD_ROOT%{prefix}/include/
+
 # Install the miscellany
 install -m755 packaging/RedHat/smbprint $RPM_BUILD_ROOT%{prefix}/bin
 install -m755 packaging/RedHat/smb.init $RPM_BUILD_ROOT/etc/rc.d/init.d/smb

Modified: branches/SAMBA_3_0/packaging/Solaris/makepkg.sh
===================================================================
--- branches/SAMBA_3_0/packaging/Solaris/makepkg.sh	2005-10-17 16:55:23 UTC (rev 11125)
+++ branches/SAMBA_3_0/packaging/Solaris/makepkg.sh	2005-10-17 16:58:53 UTC (rev 11126)
@@ -46,8 +46,14 @@
 	
 	echo "#\n# libsmbclient\n#"
 	echo f none lib/libsmbclient.so 0755 root other
+	echo f none lib/libsmbclient.a 0755 root other
 	echo f none include/libsmbclient.h 0644 root other
 
+	echo "#\n# libmsrpc\n#"
+	echo f none lib/libmsrpc.so 0755 root other
+	echo f none lib/libmsrpc.a 0755 root other
+	echo f none include/libmsrpc.h 0644 root other
+
 	if [ -f lib/smbwrapper.so -a -f bin/smbsh ]; then
 		echo "#\n# smbwrapper\n#"
 		echo f none lib/smbwrapper.so 0755 root other