Hello community,
here is the log from the commit of package libserf for openSUSE:Factory checked
in at 2013-08-12 14:27:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libserf (Old)
and /work/SRC/openSUSE:Factory/.libserf.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libserf"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libserf/libserf.changes 2013-07-30
18:39:43.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libserf.new/libserf.changes 2013-08-12
14:27:23.000000000 +0200
@@ -1,0 +2,11 @@
+Sat Aug 10 18:43:17 UTC 2013 - andreas.stie...@gmx.de
+
+- update libserf-1.3.x-soname.patch to move shared library version
+ link generation into scons
+
+-------------------------------------------------------------------
+Tue Jul 30 22:38:55 UTC 2013 - andreas.stie...@gmx.de
+
+- run tests for 12.2 and later only
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libserf.spec ++++++
--- /var/tmp/diff_new_pack.FchToT/_old 2013-08-12 14:27:23.000000000 +0200
+++ /var/tmp/diff_new_pack.FchToT/_new 2013-08-12 14:27:23.000000000 +0200
@@ -22,7 +22,8 @@
Name: libserf
%define major 1
-%define sosuffix 0.%{major}.0
+%define minor 3
+%define SHLIBVER %minor.0.0
Version: 1.3.0
Release: 0
Summary: High-Performance Asynchronous HTTP Client Library
@@ -66,12 +67,12 @@
Greg Stein <serf-...@googlegroups.com>
Justin Erenkrantz <serf-...@googlegroups.com>
-%package -n libserf-1-0
+%package -n libserf-%major-%minor
Summary: High-Performance Asynchronous HTTP Client Library
Group: Development/Libraries/C and C++
-%description -n libserf-1-0
+%description -n libserf-%major-%minor
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
@@ -97,7 +98,7 @@
Requires: libapr1-devel >= %{minimum_apr_version}
Requires: libexpat-devel
Requires: libopenssl-devel
-Requires: libserf-1-0 = %{version}
+Requires: libserf-%major-%minor = %{version}
Requires: openldap2-devel
Requires: zlib-devel
@@ -141,30 +142,28 @@
%install
scons install --install-sandbox=%{buildroot}
-pushd %{buildroot}%{_libdir}/
-ln -s libserf-%{major}.so.%{sosuffix} libserf-%{major}.so.0
-ln -s libserf-%{major}.so.%{sosuffix} libserf-%{major}.so
-popd
%__rm -f "%{buildroot}%{_libdir}"/lib*.a
%check
+%if 0%{?suse_version} > 1210
# scons expects coma separated flags
SCONS_OPTFLAGS=`echo %{optflags} | sed "s/ /,/g"`
scons \
CFLAGS=$SCONS_OPTFLAGS \
check \
%{?_smp_mflags}
+%endif
-%post -n libserf-%{major}-0 -p /sbin/ldconfig
+%post -n libserf-%{major}-%{minor} -p /sbin/ldconfig
-%postun -n libserf-%{major}-0 -p /sbin/ldconfig
+%postun -n libserf-%{major}-%{minor} -p /sbin/ldconfig
-%files -n libserf-%{major}-0
+%files -n libserf-%{major}-%{minor}
%defattr(-,root,root)
%doc CHANGES LICENSE NOTICE README
%doc design-guide.txt
-%{_libdir}/libserf-%{major}.so.0
-%{_libdir}/libserf-%{major}.so.%{sosuffix}
+%{_libdir}/libserf-%{major}.so.%{minor}
+%{_libdir}/libserf-%{major}.so.%{SHLIBVER}
%files -n libserf-devel
%defattr(-,root,root)
++++++ libserf-1.3.x-soname.patch ++++++
--- /var/tmp/diff_new_pack.FchToT/_old 2013-08-12 14:27:24.000000000 +0200
+++ /var/tmp/diff_new_pack.FchToT/_new 2013-08-12 14:27:24.000000000 +0200
@@ -8,19 +8,37 @@
fixes warning: libserf-1-0.i586: W: no-soname /usr/lib/libserf-1.so.0.0.0
---
- SConstruct | 2 ++
- 1 file changed, 2 insertions(+)
+ SConstruct | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
Index: serf-1.3.0/SConstruct
===================================================================
---- serf-1.3.0.orig/SConstruct 2013-07-28 13:23:02.000000000 +0100
-+++ serf-1.3.0/SConstruct 2013-07-28 13:23:03.000000000 +0100
-@@ -190,6 +190,8 @@ thisdir = os.getcwd()
+--- serf-1.3.0.orig/SConstruct 2013-08-10 19:07:15.000000000 +0100
++++ serf-1.3.0/SConstruct 2013-08-10 19:09:44.000000000 +0100
+@@ -152,6 +152,8 @@ match = re.search('SERF_MAJOR_VERSION ([
+ re.DOTALL)
+ MAJOR, MINOR, PATCH = [int(x) for x in match.groups()]
+ env.Append(MAJOR=str(MAJOR))
++env.Append(MINOR=str(MINOR))
++env.Append(PATCH=str(PATCH))
+
+ # Calling external programs is okay if we're not cleaning or printing help.
+ # (cleaning: no sense in fetching information; help: we may not know where
+@@ -190,6 +192,8 @@ thisdir = os.getcwd()
libdir = '$LIBDIR'
incdir = '$PREFIX/include/serf-$MAJOR'
-+env['SHLIBVERSION']='0.${MAJOR}.0'
++env['SHLIBVERSION']='${MINOR}.0.0'
+
LIBNAME = 'libserf-${MAJOR}'
if sys.platform != 'win32':
LIBNAMESTATIC = LIBNAME
+@@ -377,7 +381,7 @@ if CALLOUT_OKAY:
+ # INSTALLATION STUFF
+
+ install_static = env.Install(libdir, lib_static)
+-install_shared = env.Install(libdir, lib_shared)
++install_shared = env.InstallVersionedLib(libdir, lib_shared)
+
+ if sys.platform == 'darwin':
+ install_shared_path = install_shared[0].abspath
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
