From e19ea8f2473147dd94c32b82e99dc2fe282a6cbf Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Mon, 17 Oct 2005 16:58:53 +0000 Subject: [PATCH] r11126: adding libmsrpc to solaris, redhat, and fedora packaging (This used to be commit c3bb9f6514eba302929bb7c8edea396a547bdf28) --- packaging/Fedora/samba.spec.tmpl | 8 ++++++++ packaging/RedHat/samba.spec.tmpl | 5 +++++ packaging/Solaris/makepkg.sh | 6 ++++++ 3 files changed, 19 insertions(+) diff --git a/packaging/Fedora/samba.spec.tmpl b/packaging/Fedora/samba.spec.tmpl index bd403fc9dc5..27b8e277f40 100644 --- a/packaging/Fedora/samba.spec.tmpl +++ b/packaging/Fedora/samba.spec.tmpl @@ -196,6 +196,14 @@ install -m 755 source/bin/libsmbclient.a $RPM_BUILD_ROOT%{_libdir}/libsmbclient. 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 diff --git a/packaging/RedHat/samba.spec.tmpl b/packaging/RedHat/samba.spec.tmpl index 0794d57b248..a4718e027b9 100644 --- a/packaging/RedHat/samba.spec.tmpl +++ b/packaging/RedHat/samba.spec.tmpl @@ -187,6 +187,11 @@ install -m 755 source/bin/libsmbclient.so $RPM_BUILD_ROOT%{prefix}/lib/ 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 diff --git a/packaging/Solaris/makepkg.sh b/packaging/Solaris/makepkg.sh index e60669703c6..4c2bf529cb3 100644 --- a/packaging/Solaris/makepkg.sh +++ b/packaging/Solaris/makepkg.sh @@ -46,8 +46,14 @@ add_dynamic_entries() 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 -- 2.34.1