From 4d90ffd8ee3130ec5e4cc7e234cacc8ef33684bac971375c705bd988d34edaf9 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Sun, 27 Apr 2008 08:21:23 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/samba?expand=0&rev=12 --- build-source-timestamp | 2 +- samba-doc.spec | 4 +-- samba.changes | 5 ++++ samba.spec | 60 ++++++++++++++++++++++-------------------- vendor-files.tar.bz2 | 4 +-- 5 files changed, 42 insertions(+), 33 deletions(-) diff --git a/build-source-timestamp b/build-source-timestamp index d4989ac..0adf0a9 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -1736 +1738 Branch : trunk diff --git a/samba-doc.spec b/samba-doc.spec index 092b737..5e0b08f 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -19,7 +19,7 @@ BuildRequires: ccache cracklib-devel cups-devel e2fsprogs-devel gdbm-devel krb5 License: GPL v3 or later Url: http://www.samba.org/ Version: 3.2.0 -Release: 4 +Release: 5 Summary: Samba Documentation Group: Documentation/Other AutoReqProv: on @@ -299,7 +299,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1736 +Source Timestamp: 1738 Branch : trunk %changelog diff --git a/samba.changes b/samba.changes index 43cbbeb..5ddf895 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Apr 26 18:03:06 CEST 2008 - lmuelle@suse.de + +- Install the shared libraries with the same name as used as soname. + ------------------------------------------------------------------- Fri Apr 25 21:46:25 CEST 2008 - lmuelle@suse.de diff --git a/samba.spec b/samba.spec index a2529b0..669d5ac 100644 --- a/samba.spec +++ b/samba.spec @@ -23,7 +23,7 @@ Group: Productivity/Networking/Samba Url: http://www.samba.org/ AutoReqProv: on Version: 3.2.0 -Release: 4 +Release: 5 %if %{suse_version} < 1031 Provides: samba3 = %{version}-%{release} Obsoletes: samba3 < %{version} @@ -265,7 +265,7 @@ Summary: Tool to administer Samba's LDAP backend Group: Productivity/Networking/Samba AutoReqProv: on Version: 1.34b -Release: 177 +Release: 178 Requires: perl-ldap %endif %if %{suse_version} > 920 @@ -582,14 +582,16 @@ cp -p source/bin/smbfilter ${RPM_BUILD_ROOT}/%{_bindir}/ # smbget cp -p source/bin/smbget ${RPM_BUILD_ROOT}/%{_bindir}/ # workaround for wrong(?) used LIBDIR setting +# FIXME Use LIBDIR as intended and LIBDIR/samba else. for file in libnetapi libsmbclient libsmbsharemodes libtalloc libtdb libwbclient; do rm "${RPM_BUILD_ROOT}/%{LIBDIR}/${file}.so" # install libs test -e "source/bin/${file}.a" && \ install -m 0644 "source/bin/${file}.a" "${RPM_BUILD_ROOT}/%{_libdir}" if test -e "source/bin/${file}.so"; then - install -m 0755 "source/bin/${file}.so" "${RPM_BUILD_ROOT}/%{_libdir}/${file}.so.0" - ln -s "${file}.so.0" "${RPM_BUILD_ROOT}/%{_libdir}/${file}.so" + major_version=$( grep \^bin/${file}.so: source/library-versions | cut -d: -f2) + install -m 0755 $( find source/bin/ -type f -name ${file}.so*) "${RPM_BUILD_ROOT}/%{_libdir}/${file}.so.${major_version}" + ln -s "${file}.so.${major_version}" "${RPM_BUILD_ROOT}/%{_libdir}/${file}.so" fi done # install nsswitch-headers (for squid, etc. #FIXME) @@ -1242,7 +1244,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1736 +Source Timestamp: 1738 Branch : trunk %if %{suse_version} > 1020 @@ -1257,7 +1259,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1736 +Source Timestamp: 1738 Branch : trunk %endif @@ -1284,7 +1286,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1736 +Source Timestamp: 1738 Branch : trunk %description winbind @@ -1296,7 +1298,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1736 +Source Timestamp: 1738 Branch : trunk %if %{make_utils} @@ -1328,7 +1330,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1736 +Source Timestamp: 1738 Branch : trunk %endif @@ -1342,7 +1344,7 @@ Authors: -------- Jeremy Allison -Source Timestamp: 1736 +Source Timestamp: 1738 Branch : trunk %if %{make_pdb} @@ -1356,7 +1358,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1736 +Source Timestamp: 1738 Branch : trunk %endif @@ -1374,7 +1376,7 @@ Authors: -------- Rainer Link -Source Timestamp: 1736 +Source Timestamp: 1738 Branch : trunk %endif @@ -1388,7 +1390,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1736 +Source Timestamp: 1738 Branch : trunk %description -n libnetapi-devel @@ -1401,7 +1403,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1736 +Source Timestamp: 1738 Branch : trunk %if %{suse_version} < 1031 @@ -1421,7 +1423,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1736 +Source Timestamp: 1738 Branch : trunk %else @@ -1435,7 +1437,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1736 +Source Timestamp: 1738 Branch : trunk %endif @@ -1454,7 +1456,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1736 +Source Timestamp: 1738 Branch : trunk %if %{suse_version} < 1031 @@ -1468,7 +1470,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1736 +Source Timestamp: 1738 Branch : trunk %else @@ -1482,7 +1484,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1736 +Source Timestamp: 1738 Branch : trunk %endif @@ -1502,7 +1504,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1736 +Source Timestamp: 1738 Branch : trunk %description -n libtalloc1 @@ -1514,7 +1516,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1736 +Source Timestamp: 1738 Branch : trunk %description -n libtalloc-devel @@ -1527,7 +1529,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1736 +Source Timestamp: 1738 Branch : trunk %description -n libtdb0 @@ -1539,7 +1541,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1736 +Source Timestamp: 1738 Branch : trunk %description -n libtdb-devel @@ -1552,7 +1554,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1736 +Source Timestamp: 1738 Branch : trunk %description -n libwbclient0 @@ -1564,7 +1566,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1736 +Source Timestamp: 1738 Branch : trunk %description -n libwbclient-devel @@ -1577,7 +1579,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1736 +Source Timestamp: 1738 Branch : trunk %if %{make_ldapsmb} @@ -1592,7 +1594,7 @@ Authors: -------- Guenther Deschner -Source Timestamp: 1736 +Source Timestamp: 1738 Branch : trunk %endif @@ -1608,12 +1610,14 @@ Authors: -------- Steve French -Source Timestamp: 1736 +Source Timestamp: 1738 Branch : trunk %endif %changelog +* Sat Apr 26 2008 lmuelle@suse.de +- Install the shared libraries with the same name as used as soname. * Fri Apr 25 2008 lmuelle@suse.de - Update to 3.2.0pre3. + Use of IDL generated parsing layer for several DCE/RPC interfaces. diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 880b810..0b73136 100644 --- a/vendor-files.tar.bz2 +++ b/vendor-files.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7a241b2e74978bd3820f7c6c9353363dcc7d30da10cfdb3839d5ce0675e06edc -size 21902 +oid sha256:accfb09e46cd3b04921a1ad135fcb336aaa4b6acca9a823a01865af0b3302599 +size 21918