Hello community,
here is the log from the commit of package libserf for openSUSE:Factory checked
in at 2013-07-30 18:39:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-25
14:29:11.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libserf.new/libserf.changes 2013-07-30
18:39:43.000000000 +0200
@@ -1,0 +2,17 @@
+Sun Jul 28 14:54:40 UTC 2013 - andreas.stie...@gmx.de
+
+- update libserf-1.3.x-soname.patch to add SHLIBVERSION to make
+ scons add a SONAME instead of a global linker flag. This is only
+ effective with scons >= 2.3
+- fix running of regression/unit test suite:
+ * add libserf-1.3.x-scons-check-exit.patch to return a non-zero
+ exist status upon check failures
+ * call scons check with CFLAGS
+
+-------------------------------------------------------------------
+Fri Jul 26 22:10:36 UTC 2013 - andreas.stie...@gmx.de
+
+- update libserf-1.3.x-gssapi-libs.patch with upstream commit,
+ mark as committed upstream
+
+-------------------------------------------------------------------
New:
----
libserf-1.3.x-scons-check-exit.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libserf.spec ++++++
--- /var/tmp/diff_new_pack.LEVQpY/_old 2013-07-30 18:39:44.000000000 +0200
+++ /var/tmp/diff_new_pack.LEVQpY/_new 2013-07-30 18:39:44.000000000 +0200
@@ -21,8 +21,8 @@
%define minimum_apr_version 1.3.0
Name: libserf
-%define soname 0
%define major 1
+%define sosuffix 0.%{major}.0
Version: 1.3.0
Release: 0
Summary: High-Performance Asynchronous HTTP Client Library
@@ -34,6 +34,7 @@
Patch0: libserf-1.3.x-libdir.patch
Patch1: libserf-1.3.x-soname.patch
Patch2: libserf-1.3.x-gssapi-libs.patch
+Patch3: libserf-1.3.x-scons-check-exit.patch
BuildRequires: gcc
BuildRequires: glibc-devel
BuildRequires: libapr-util1-devel >= %{minimum_apr_version}
@@ -44,7 +45,8 @@
BuildRequires: make
BuildRequires: openldap2-devel
BuildRequires: pkgconfig
-BuildRequires: scons >= 2.0
+# SHLIBVERERSION introduced in 2.3 (libserf-1.3.x-soname.patch)
+BuildRequires: scons >= 2.3
BuildRequires: zlib-devel
%if %{with gssapi}
BuildRequires: krb5-devel
@@ -118,6 +120,7 @@
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%build
# scons expects coma separated flags
@@ -139,29 +142,33 @@
%install
scons install --install-sandbox=%{buildroot}
pushd %{buildroot}%{_libdir}/
-%__mv libserf-%{major}.so libserf-%{major}.so.%{soname}.0.0
-ln -s libserf-%{major}.so.%{soname}.0.0 libserf-%{major}.so.%{soname}
-ln -s libserf-%{major}.so.%{soname}.0.0 libserf-%{major}.so
+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
-scons CFLAGS="" check
+# scons expects coma separated flags
+SCONS_OPTFLAGS=`echo %{optflags} | sed "s/ /,/g"`
+scons \
+ CFLAGS=$SCONS_OPTFLAGS \
+ check \
+ %{?_smp_mflags}
-%post -n libserf-1-0 -p /sbin/ldconfig
+%post -n libserf-%{major}-0 -p /sbin/ldconfig
-%postun -n libserf-1-0 -p /sbin/ldconfig
+%postun -n libserf-%{major}-0 -p /sbin/ldconfig
-%files -n libserf-1-0
+%files -n libserf-%{major}-0
%defattr(-,root,root)
%doc CHANGES LICENSE NOTICE README
%doc design-guide.txt
-%{_libdir}/libserf-%{major}.so.%{soname}
-%{_libdir}/libserf-%{major}.so.%{soname}.*.*
+%{_libdir}/libserf-%{major}.so.0
+%{_libdir}/libserf-%{major}.so.%{sosuffix}
%files -n libserf-devel
%defattr(-,root,root)
-%_includedir/serf-%major
+%_includedir/serf-%{major}
%{_libdir}/libserf-%{major}.so
%{_libdir}/pkgconfig/serf-%{major}.pc
++++++ libserf-1.3.x-gssapi-libs.patch ++++++
--- /var/tmp/diff_new_pack.LEVQpY/_old 2013-07-30 18:39:44.000000000 +0200
+++ /var/tmp/diff_new_pack.LEVQpY/_new 2013-07-30 18:39:44.000000000 +0200
@@ -1,28 +1,28 @@
From: Andreas Stieger <andreas.stie...@gmx.de>
Date: 2013-07-24 23:58:00 +0100
Subject: [PATCH] add gssapi libs to pkgconfig file, resolve TODO
-References: https://code.google.com/p/serf/issues/detail?id=113
-Upstream: submitted
+References: https://code.google.com/p/serf/issues/detail?id=113
http://code.google.com/p/serf/source/diff?spec=svn2079&old=2070&r=2079&format=unidiff&path=%2Ftrunk%2FSConstruct
+Upstream: committed
Makes pkgconfig file contain libraries for gssapi
----
- SConstruct | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-Index: serf-1.3.0/SConstruct
+Index: trunk/SConstruct
===================================================================
---- serf-1.3.0.orig/SConstruct 2013-07-24 23:40:43.000000000 +0100
-+++ serf-1.3.0/SConstruct 2013-07-24 23:48:19.000000000 +0100
-@@ -345,6 +345,7 @@ else:
+--- trunk/SConstruct (revision 2078)
++++ trunk/SConstruct (revision 2079)
+@@ -334,7 +334,10 @@
+
+ # If build with gssapi, get its information and define SERF_HAVE_GSSAPI
if gssapi and CALLOUT_OKAY:
- env.ParseConfig('$GSSAPI --libs gssapi')
+- env.ParseConfig('$GSSAPI --libs gssapi')
++ def parse_libs(env, cmd, unique=1):
++ env['GSSAPI_LIBS'] = cmd.strip()
++ return env.MergeFlags(cmd, unique)
++ env.ParseConfig('$GSSAPI --libs gssapi', parse_libs)
env.Append(CPPDEFINES='SERF_HAVE_GSSAPI')
-+ gssapi_libs = os.popen(env.subst('$GSSAPI --libs gssapi')).read().strip()
if sys.platform == 'win32':
env.Append(CPPDEFINES=['SERF_HAVE_SSPI'])
-
-@@ -356,7 +357,6 @@ if sys.platform == 'sunos5':
+@@ -347,7 +350,6 @@
env.Append(RPATH=d)
# Set up the construction of serf-*.pc
@@ -30,12 +30,13 @@
pkgconfig = env.Textfile('serf-%d.pc' % (MAJOR,),
env.File('build/serf.pc.in'),
SUBST_DICT = {
-@@ -364,7 +364,7 @@ pkgconfig = env.Textfile('serf-%d.pc' %
+@@ -355,7 +357,8 @@
'@PREFIX@': '$PREFIX',
'@INCLUDE_SUBDIR@': 'serf-%d' % (MAJOR,),
'@VERSION@': '%d.%d.%d' % (MAJOR, MINOR, PATCH),
- '@LIBS@': '%s %s -lz' % (apu_libs, apr_libs),
-+ '@LIBS@': '%s %s %s -lz' % (gssapi_libs, apu_libs,
apr_libs),
++ '@LIBS@': '%s %s %s -lz' % (apu_libs, apr_libs,
++
env.get('GSSAPI_LIBS')),
})
env.Default(lib_static, lib_shared, pkgconfig)
++++++ libserf-1.3.x-scons-check-exit.patch ++++++
From: Andreas Stieger <andreas.stie...@gmx.de>
Date: Sun, 28 Jul 2013 14:16:28 +0100
Subject: [PATCH] scons check should return non-zero exit status
References: https://code.google.com/p/serf/issues/detail?id=116
http://code.google.com/p/serf/source/detail?r=2081
Upstream: committed
make "scons check" return a non-zero exis status for %check to make sense
Index: trunk/build/check.py
===================================================================
--- trunk/build/check.py (revision 2080)
+++ trunk/build/check.py (revision 2081)
@@ -48,6 +48,7 @@ if __name__ == '__main__':
subprocess.check_call([SERF_RESPONSE_EXE, case])
except subprocess.CalledProcessError:
print "ERROR: test case %s failed" % (case)
+ sys.exit(1)
print "== Running the unit tests =="
try:
@@ -54,3 +55,4 @@ if __name__ == '__main__':
subprocess.check_call(TEST_ALL_EXE)
except subprocess.CalledProcessError:
print "ERROR: test(s) failed in test_all"
+ sys.exit(1)
++++++ libserf-1.3.x-soname.patch ++++++
--- /var/tmp/diff_new_pack.LEVQpY/_old 2013-07-30 18:39:44.000000000 +0200
+++ /var/tmp/diff_new_pack.LEVQpY/_new 2013-07-30 18:39:44.000000000 +0200
@@ -4,31 +4,23 @@
References: https://code.google.com/p/serf/issues/detail?id=112
Upstream: submitted
-add an soname to the linker options
+add an soname, works with scons >= 2.3.0
fixes warning: libserf-1-0.i586: W: no-soname /usr/lib/libserf-1.so.0.0.0
---
- SConstruct | 3 +++
- 1 file changed, 3 insertions(+)
+ SConstruct | 2 ++
+ 1 file changed, 2 insertions(+)
Index: serf-1.3.0/SConstruct
===================================================================
---- serf-1.3.0.orig/SConstruct 2013-07-24 22:43:28.000000000 +0100
-+++ serf-1.3.0/SConstruct 2013-07-24 22:59:36.000000000 +0100
-@@ -191,6 +191,7 @@ libdir = '$LIBDIR'
+--- 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()
+ libdir = '$LIBDIR'
incdir = '$PREFIX/include/serf-$MAJOR'
++env['SHLIBVERSION']='0.${MAJOR}.0'
++
LIBNAME = 'libserf-${MAJOR}'
-+SONAME='libserf-${MAJOR}.so.0'
if sys.platform != 'win32':
LIBNAMESTATIC = LIBNAME
- else:
-@@ -199,6 +200,8 @@ else:
- env.Append(RPATH=libdir,
- PDB='${TARGET.filebase}.pdb')
-
-+env.Append(LINKFLAGS='-Wl,-soname,%s' % SONAME )
-+
- 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,))
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
