diff options
| author | Michael Adam <obnox@samba.org> | 2008-09-10 13:48:13 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2008-09-11 13:17:09 +0200 |
| commit | 1cac6185bdee2cad3af6b6447b6b291cc9b473ac (patch) | |
| tree | 9982aef2062cd8cf0ab36ca4ef12c265484a69e7 | |
| parent | 15558d604718e1c5b7f1d65cfaa539a596154901 (diff) | |
| download | samba-1cac6185bdee2cad3af6b6447b6b291cc9b473ac.tar.gz | |
packaging(RHEL): workaround all library installations by mv to %{_libarchdir}
This is all that is still necessary in 3.2.3+.
(The eloquent workarounds for libsmbclient and libsmbsharemodes
are removed.)
In 3.3.0, with the separation of libdir and modulesdir, even this
step becomes unnecessary.
Michael
(cherry picked from commit fe8448fe8f7ee0d33631366503163d3b2ee3eded)
| -rw-r--r-- | packaging/RHEL/samba.spec.tmpl | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/packaging/RHEL/samba.spec.tmpl b/packaging/RHEL/samba.spec.tmpl index 5481989d5e1..b2a7fc374b6 100644 --- a/packaging/RHEL/samba.spec.tmpl +++ b/packaging/RHEL/samba.spec.tmpl @@ -224,20 +224,17 @@ install -m 755 source/nsswitch/libnss_wins.so $RPM_BUILD_ROOT/%{_libarch}/libnss ln -sf libnss_winbind.so libnss_winbind.so.2; ln -sf libnss_wins.so libnss_wins.so.2 ) -# make install puts libsmbclient.so in the wrong place on x86_64 -rm -f $RPM_BUILD_ROOT/usr/lib*/samba/libsmbclient.so $RPM_BUILD_ROOT/usr/lib*/samba/libsmbclient.a || true -install -m 755 source/bin/libsmbclient.so $RPM_BUILD_ROOT%{_libarchdir}/libsmbclient.so -install -m 755 source/bin/libsmbclient.a $RPM_BUILD_ROOT%{_libarchdir}/libsmbclient.a -install -m 644 source/include/libsmbclient.h $RPM_BUILD_ROOT%{_includedir} -ln -s %{_libarchdir}/libsmbclient.so $RPM_BUILD_ROOT%{_libarchdir}/libsmbclient.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%{_libarchdir}/libsmbsharemodes.so -install -m 755 source/bin/libsmbsharemodes.a $RPM_BUILD_ROOT%{_libarchdir}/libsmbsharemodes.a -install -m 644 source/include/smb_share_modes.h $RPM_BUILD_ROOT%{_includedir} -rm -f $RPM_BUILD_ROOT%{_libarchdir}/samba/libsmbsharemodes.* -ln -s /%{_libdir}/libsmbsharemodes.so $RPM_BUILD_ROOT%{_libarchdir}/libsmbsharemodes.so.0 +# Put the shared (and possibly static) libraries into /usr/lib{,64}/ . +# Samba 3.2.2 installs them into /usr/lib{,64}/samba/ . +# This step will become unnecessary in 3.3.0. +# +for library in libsmbclient libsmbsharemodes libwbclient libtalloc libtdb +libnetapi +do + mv -f ${RPM_BUILD_ROOT}%{_libarchdir}/samba/${library}.* \ + ${RPM_BUILD_ROOT}%{_libarchdir}/ +done + ## cleanup /bin/rm -rf $RPM_BUILD_ROOT/usr/lib*/samba/security |