Hello community, here is the log from the commit of package libserf for openSUSE:13.1 checked in at 2013-09-29 17:49:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1/libserf (Old) and /work/SRC/openSUSE:13.1/.libserf.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libserf" Changes: -------- --- /work/SRC/openSUSE:13.1/libserf/libserf.changes 2013-09-23 10:58:52.000000000 +0200 +++ /work/SRC/openSUSE:13.1/.libserf.new/libserf.changes 2013-09-29 17:49:11.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Sep 27 23:05:02 UTC 2013 - [email protected] + +- adjust library package name, SONAME and SHLIBVER to match future + releases and make maintenance easier + serf-1.3.x-shlibver-soname.patch [bnc#842941] + +------------------------------------------------------------------- New: ---- serf-1.3.x-shlibver-soname.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libserf.spec ++++++ --- /var/tmp/diff_new_pack.XIMzLN/_old 2013-09-29 17:49:11.000000000 +0200 +++ /var/tmp/diff_new_pack.XIMzLN/_new 2013-09-29 17:49:11.000000000 +0200 @@ -23,13 +23,14 @@ Name: libserf %define major 1 %define minor 3 -%define SHLIBVER %minor.0.0 +%define SHLIBVER %major.%minor.0 Version: 1.3.1 Release: 0 Summary: High-Performance Asynchronous HTTP Client Library License: Apache-2.0 Group: System/Libraries Source: https://serf.googlecode.com/files/serf-%{version}.tar.bz2 +Patch1: serf-1.3.x-shlibver-soname.patch Url: https://serf.googlecode.com BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gcc @@ -60,12 +61,12 @@ Greg Stein <[email protected]> Justin Erenkrantz <[email protected]> -%package -n libserf-%major-%minor +%package -n libserf-%major-%major Summary: High-Performance Asynchronous HTTP Client Library Group: Development/Libraries/C and C++ -%description -n libserf-%major-%minor +%description -n libserf-%major-%major The serf library is a C-based HTTP client library built upon the Apache Portable Runtime (APR) library. It multiplexes connections, running the read/write communication asynchronously. Memory copies and transformations are @@ -91,7 +92,7 @@ Requires: libapr1-devel >= %{minimum_apr_version} Requires: libexpat-devel Requires: libopenssl-devel -Requires: libserf-%major-%minor = %{version} +Requires: libserf-%major-%major = %{version} Requires: openldap2-devel Requires: zlib-devel @@ -111,6 +112,7 @@ %prep %setup -q -n "serf-%{version}" +%patch1 -p1 %build scons \ @@ -139,15 +141,15 @@ %{?_smp_mflags} %endif -%post -n libserf-%{major}-%{minor} -p /sbin/ldconfig +%post -n libserf-%{major}-%{major} -p /sbin/ldconfig -%postun -n libserf-%{major}-%{minor} -p /sbin/ldconfig +%postun -n libserf-%{major}-%{major} -p /sbin/ldconfig -%files -n libserf-%{major}-%{minor} +%files -n libserf-%{major}-%{major} %defattr(-,root,root) %doc CHANGES LICENSE NOTICE README %doc design-guide.txt -%{_libdir}/libserf-%{major}.so.%{minor} +%{_libdir}/libserf-%{major}.so.%{major} %{_libdir}/libserf-%{major}.so.%{SHLIBVER} %files -n libserf-devel ++++++ serf-1.3.x-shlibver-soname.patch ++++++ Date: 2013-09-09 17:19:46 +0100 Subject: Use for the shared library version string both MAJOR and MINOR version Upstream: commited References: http://code.google.com/p/serf/source/detail?r=2163 https://bugzilla.novell.com/show_bug.cgi?id=842941 ------------------------------------------------------------------------ r2163 | lieven.govaerts | 2013-09-09 17:19:46 +0100 (Mon, 09 Sep 2013) | 15 lines Changed paths: M /trunk/SConstruct Use for the shared library version string both MAJOR and MINOR version. Remove the Mac specific current_version and compatibility_version setter code in favor of scons built-in support (even if that's slightly flawed by filling in both options with the same version). Note: this has as consequence on Mac that the current_version and compatibility_version option values change for the 1.3.x branch from 4.x.x to 1.x.0. * SConstruct (SHLIBVERSION): Use major.minor version. (darwin/LINKFLAGS): Don't set the current_version and compatibility_version options. Scons already does this, and setting them twice doesn't work with older versions of gcc. ------------------------------------------------------------------------ --- SConstruct | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) Index: serf-1.3.1/SConstruct =================================================================== --- serf-1.3.1.orig/SConstruct 2013-08-15 10:13:20.000000000 +0100 +++ serf-1.3.1/SConstruct 2013-09-28 00:02:58.000000000 +0100 @@ -204,9 +204,15 @@ thisdir = os.getcwd() libdir = '$LIBDIR' incdir = '$PREFIX/include/serf-$MAJOR' -env['SHLIBVERSION']='${MINOR}.0.0' +# This version string is used in the dynamic library name, and for Mac OS X also +# for the current_version and compatibility_version options in the .dylib +# +# Unfortunately we can't set the .dylib compatibility_version option separately +# from current_version, so don't use the PATCH level to avoid that build and +# runtime patch levels have to be identical. +env['SHLIBVERSION'] = '%d.%d.%d' % (MAJOR, MINOR, 0) -LIBNAME = 'libserf-${MAJOR}' +LIBNAME = 'libserf-%d' % (MAJOR,) if sys.platform != 'win32': LIBNAMESTATIC = LIBNAME else: @@ -218,10 +224,6 @@ env.Append(RPATH=libdir, if sys.platform == 'darwin': # linkflags.append('-Wl,-install_name,@executable_path/%s.dylib' % (LIBNAME,)) env.Append(LINKFLAGS='-Wl,-install_name,%s/%s.dylib' % (thisdir, LIBNAME,)) - # 'man ld' says positive non-zero for the first number, so we add one. - # Mac's interpretation of compatibility is the same as our MINOR version. - env.Append(LINKFLAGS='-Wl,-compatibility_version,%d' % (MINOR+1,)) - env.Append(LINKFLAGS='-Wl,-current_version,%d.%d' % (MINOR+1, PATCH,)) if sys.platform != 'win32': ### gcc only. figure out appropriate test / better way to check these -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
