Hello community,
here is the log from the commit of package sunpinyin for openSUSE:Factory
checked in at 2017-11-24 10:57:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sunpinyin (Old)
and /work/SRC/openSUSE:Factory/.sunpinyin.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sunpinyin"
Fri Nov 24 10:57:29 2017 rev:14 rq:545055 version:2.0.99
Changes:
--------
--- /work/SRC/openSUSE:Factory/sunpinyin/sunpinyin.changes 2017-09-13
22:35:18.561591704 +0200
+++ /work/SRC/openSUSE:Factory/.sunpinyin.new/sunpinyin.changes 2017-11-24
10:57:31.473592579 +0100
@@ -1,0 +2,6 @@
+Thu Nov 23 16:50:07 UTC 2017 - dims...@opensuse.org
+
+- Add sunpinyin-scons-on-py3.patch: Fix build with scons using
+ python3 as interpreter.
+
+-------------------------------------------------------------------
New:
----
sunpinyin-scons-on-py3.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sunpinyin.spec ++++++
--- /var/tmp/diff_new_pack.YtXxGJ/_old 2017-11-24 10:57:33.189529914 +0100
+++ /var/tmp/diff_new_pack.YtXxGJ/_new 2017-11-24 10:57:33.193529768 +0100
@@ -33,6 +33,8 @@
Patch1: no-download.patch
#PATCH-FIX-UPSTREAM bmwiedem...@opensuse.org make build reproducible
Patch2: reproducible.patch
+# PATCH-FIx-UPSTREAM sunpinyin-scons-on-py3.patch dims...@opensuse.org -- Fix
build with scons using python3 as interpreter
+Patch3: sunpinyin-scons-on-py3.patch
BuildRequires: gcc-c++
BuildRequires: pkg-config
BuildRequires: scons
@@ -88,6 +90,7 @@
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
cp -r %{SOURCE1} .
cp -r %{SOURCE2} .
cp -r %{SOURCE3} src
++++++ sunpinyin-scons-on-py3.patch ++++++
Index: sunpinyin-3.0.0-rc1/SConstruct
===================================================================
--- sunpinyin-3.0.0-rc1.orig/SConstruct
+++ sunpinyin-3.0.0-rc1/SConstruct
@@ -1,6 +1,7 @@
import platform
import os
import sys
+import functools
version = "2.0.4"
@@ -227,7 +228,7 @@ def CreateEnvironment():
def PassVariables(envvar, env):
for (x, y) in envvar:
if x in os.environ:
- print 'Warning: you\'ve set %s in the environmental variable!' % x
+ print ('Warning: you\'ve set %s in the environmental variable!' %
x)
env[y] = os.environ[x]
env = CreateEnvironment()
@@ -429,7 +430,7 @@ env.Substfile('sunpinyin-2.0.pc.in', SUB
'@PREFIX@': env['PREFIX'],
'@LIBDIR@': env['LIBDIR'],
'@VERSION@': version,
- '@CFLAGS@': reduce(lambda a, b: a + ' ' + b,
+ '@CFLAGS@': functools.reduce(lambda a, b: a + ' ' + b,
map(lambda x: '-I$${includedir}' + x[3:],
sorted(allinc()))),
})
Index: sunpinyin-3.0.0-rc1/src/SConscript
===================================================================
--- sunpinyin-3.0.0-rc1.orig/src/SConscript
+++ sunpinyin-3.0.0-rc1/src/SConscript
@@ -53,7 +53,7 @@ env.Substfile('sunpinyin-dictgen.mk.in',
})
env.Command('sunpinyin-dictgen', 'sunpinyin-dictgen.mk', [
Copy("$TARGET", "$SOURCE"),
- Chmod("$TARGET", 0755),
+ Chmod("$TARGET", 0o755),
])
env.Substfile('sunpinyin-dictgen-local.mk.in', SUBST_DICT={
@@ -64,7 +64,7 @@ env.Substfile('sunpinyin-dictgen-local.m
})
env.Command('sunpinyin-dictgen-local', 'sunpinyin-dictgen-local.mk', [
Copy("$TARGET", "$SOURCE"),
- Chmod("$TARGET", 0755),
+ Chmod("$TARGET", 0o755),
])
# -*- indent-tabs-mode: nil -*- vim:et:ts=4
