From: Michael Adam <obnox@samba.org>
Date: Fri, 23 May 2008 13:12:01 +0000 (+0200)
Subject: packaging(RHEL-CTDB): fix placement and link direction of new shared libs
X-Git-Tag: samba-4.0.0alpha6~801^2~326
X-Git-Url: http://git.samba.org/?p=samba.git;a=commitdiff_plain;h=14c0f896b387e450f4513e4a82f20e0427cca559

packaging(RHEL-CTDB): fix placement and link direction of new shared libs

libwbclient, libtalloc, libtdb, and libnetapi are now installed
into /usr/lib{,64} by their SONAME. The symlink is made from
the .so files to point to the SONAME files (e.g., libtdb.so.1).

Michael
(This used to be commit d18287b6284597878bc3683f16f001b949857e54)
---

diff --git a/packaging/RHEL-CTDB/samba.spec b/packaging/RHEL-CTDB/samba.spec
index 4dea6d78549..49784bec315 100644
--- a/packaging/RHEL-CTDB/samba.spec
+++ b/packaging/RHEL-CTDB/samba.spec
@@ -273,11 +273,29 @@ ln -s /%{_libdir}/libsmbsharemodes.so $RPM_BUILD_ROOT%{_libdir}/libsmbsharemodes
 # Install pam_smbpass.so
 install -m755 source/bin/pam_smbpass.so $RPM_BUILD_ROOT/%{_libarch}/security/pam_smbpass.so
 
+# Put the shared libraries to their SONAME under /usr/lib{,64}
+# and create the proper .so symlinks
 #
-ln -s %{_libdir}/samba/libwbclient.so $RPM_BUILD_ROOT/%{_libdir}/libwbclient.so.0
-ln -s %{_libdir}/samba/libtalloc.so $RPM_BUILD_ROOT/%{_libdir}/libtalloc.so.1
-ln -s %{_libdir}/samba/libtdb.so $RPM_BUILD_ROOT/%{_libdir}/libtdb.so.0
-ln -s %{_libdir}/samba/libnetapi.so $RPM_BUILD_ROOT/%{_libdir}/libnetapi.so.0
+# libwbclient
+rm -f $RPM_BUILD_ROOT%{_libdir}/samba/libwbclient.so*
+install -m 755 source/bin/libwbclient.so \
+	$RPM_BUILD_ROOT%{_libdir}/libwbclient.so.0
+ln -s libwbclient.so.0 $RPM_BUILD_ROOT%{_libdir}/libwbclient.so
+# libtalloc
+rm -f $RPM_BUILD_ROOT%{_libdir}/samba/libtalloc.so*
+install -m 755 source/bin/libtalloc.so \
+	$RPM_BUILD_ROOT%{_libdir}/libtalloc.so.1
+ln -s libtalloc.so.1 $RPM_BUILD_ROOT%{_libdir}/libtalloc.so
+# libtdb
+rm -f $RPM_BUILD_ROOT%{_libdir}/samba/libtdb.so*
+install -m 755 source/bin/libtdb.so \
+	$RPM_BUILD_ROOT%{_libdir}/libtdb.so.1
+ln -s libtdb.so.1 $RPM_BUILD_ROOT%{_libdir}/libtdb.so
+# libnetapi
+rm -f $RPM_BUILD_ROOT%{_libdir}/samba/libnetapi.so*
+install -m 755 source/bin/libnetapi.so \
+	$RPM_BUILD_ROOT%{_libdir}/libnetapi.so.0
+ln -s libnetapi.so.0 $RPM_BUILD_ROOT%{_libdir}/libnetapi.so
 
 ## cleanup
 /bin/rm -rf $RPM_BUILD_ROOT/usr/lib*/samba/security
@@ -507,13 +525,9 @@ exit 0
 %{_includedir}/wbclient.h
 %{_includedir}/talloc.h
 %{_includedir}/tdb.h
-%{_libdir}/samba/libnetapi.so*
 %{_libdir}/libnetapi.so*
-%{_libdir}/samba/libtalloc.so*
 %{_libdir}/libtalloc.so*
-%{_libdir}/samba/libtdb.so*
 %{_libdir}/libtdb.so*
-%{_libdir}/samba/libwbclient.so*
 %{_libdir}/libwbclient.so*
 
 %{_sbindir}/winbind