Hello community, here is the log from the commit of package libserf for openSUSE:Factory checked in at 2017-11-14 14:07:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libserf (Old) and /work/SRC/openSUSE:Factory/.libserf.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libserf" Tue Nov 14 14:07:23 2017 rev:25 rq:539994 version:1.3.9 Changes: -------- --- /work/SRC/openSUSE:Factory/libserf/libserf.changes 2017-04-25 08:58:41.418829881 +0200 +++ /work/SRC/openSUSE:Factory/.libserf.new/libserf.changes 2017-11-14 14:07:33.504767526 +0100 @@ -1,0 +2,6 @@ +Wed Nov 8 17:52:52 UTC 2017 - astie...@suse.com + +- Add libserf-python3.patch and libserf-python3-2.patch to fix + building with python3 + +------------------------------------------------------------------- New: ---- libserf-python3-2.patch libserf-python3.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libserf.spec ++++++ --- /var/tmp/diff_new_pack.BkDgGP/_old 2017-11-14 14:07:35.076710199 +0100 +++ /var/tmp/diff_new_pack.BkDgGP/_new 2017-11-14 14:07:35.076710199 +0100 @@ -32,6 +32,12 @@ Source: https://dist.apache.org/repos/dist/dev/serf/serf-%{version}.tar.bz2 Source2: https://dist.apache.org/repos/dist/dev/serf/serf-%{version}.tar.bz2.asc Source3: https://people.apache.org/keys/group/serf.asc#/%{name}.keyring +# PATCH-FIX-UPSTREAM libserf-python3.patch +# https://github.com/apache/serf/commit/d4de5a672d8c03b82ba70c1b737926bcf078f761 +Patch0: libserf-python3.patch +# PATCH-FIX-UPSTREAM libserf-python3-2.patch +# http://svn.apache.org/viewvc?view=revision&revision=1814604 +Patch1: libserf-python3-2.patch BuildRequires: gcc BuildRequires: glibc-devel BuildRequires: libapr-util1-devel >= %{minimum_apr_version} @@ -85,6 +91,8 @@ %prep %setup -q -n "serf-%{version}" +%patch0 -p1 +%patch1 -p1 %build scons \ ++++++ libserf-python3-2.patch ++++++ ------------------------------------------------------------------------ r1814604 | astieger | 2017-11-08 18:05:28 +0100 (Wed, 08 Nov 2017) | 5 lines Changed paths: M /serf/trunk/SConstruct Follow-up to r1811083, fix building with scons 3.0.0 and Python3 * SConstruct: Append decode('utf-8) to FILE.get_contents() to avoid TypeError: cannot use a string pattern on a bytes-like object ------------------------------------------------------------------------ Index: trunk/SConstruct =================================================================== --- trunk/SConstruct (revision 1814603) +++ trunk/SConstruct (revision 1814604) @@ -182,7 +182,7 @@ match = re.search('SERF_MAJOR_VERSION ([0-9]+).*' 'SERF_MINOR_VERSION ([0-9]+).*' 'SERF_PATCH_VERSION ([0-9]+)', - env.File('serf.h').get_contents(), + env.File('serf.h').get_contents().decode('utf-8'), re.DOTALL) MAJOR, MINOR, PATCH = [int(x) for x in match.groups()] env.Append(MAJOR=str(MAJOR)) ++++++ libserf-python3.patch ++++++ >From d4de5a672d8c03b82ba70c1b737926bcf078f761 Mon Sep 17 00:00:00 2001 From: Bert Huijben <rhuij...@apache.org> Date: Wed, 4 Oct 2017 14:56:22 +0000 Subject: [PATCH] Fix syntax of a print() in the scons file to unbreak building with most recent scons version. * SConstruct Use Python 3.0 valid syntax to make Scons 3.0.0 happy on both python 3.0 and 2.7. git-svn-id: https://svn.apache.org/repos/asf/serf/trunk@1811083 13f79535-47bb-0310-9956-ffa450edef68 --- SConstruct | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SConstruct b/SConstruct index e5d407b..fab9828 100644 --- a/SConstruct +++ b/SConstruct @@ -199,7 +199,7 @@ CALLOUT_OKAY = not (env.GetOption('clean') or env.GetOption('help')) unknown = opts.UnknownVariables() if unknown: - print 'Warning: Used unknown variables:', ', '.join(unknown.keys()) + print('Warning: Used unknown variables:', ', '.join(unknown.keys())) apr = str(env['APR']) apu = str(env['APU'])
