Hello community, here is the log from the commit of package mypaint for openSUSE:Factory checked in at 2017-11-27 22:15:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mypaint (Old) and /work/SRC/openSUSE:Factory/.mypaint.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mypaint" Mon Nov 27 22:15:51 2017 rev:2 rq:545250 version:1.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/mypaint/mypaint.changes 2017-08-24 18:32:43.199725097 +0200 +++ /work/SRC/openSUSE:Factory/.mypaint.new/mypaint.changes 2017-11-27 22:15:53.900107145 +0100 @@ -1,0 +2,6 @@ +Fri Nov 24 13:25:51 UTC 2017 - [email protected] + +- Add mypaint-scons-to-python3.patch Convert SCons* to python3 for + compatibility with openSUSE > 1320 where scons is python3-based. + +------------------------------------------------------------------- New: ---- mypaint-scons-to-python3.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mypaint.spec ++++++ --- /var/tmp/diff_new_pack.cArDZd/_old 2017-11-27 22:15:55.456050666 +0100 +++ /var/tmp/diff_new_pack.cArDZd/_new 2017-11-27 22:15:55.464050375 +0100 @@ -1,7 +1,7 @@ # # spec file for package mypaint # -# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,6 +25,8 @@ Group: Productivity/Graphics/Other Url: http://mypaint.org Source: https://github.com/mypaint/mypaint/releases/download/v1.1.0/mypaint-1.1.0.tar.bz2 +# PATCH-FIX-UPSTREAM mypaint-scons-to-python3.patch [email protected] -- Convert SCons* to python3 for compatibility with openSUSE > 1320 where scons is python3 based +Patch0: mypaint-scons-to-python3.patch BuildRequires: ImageMagick BuildRequires: fdupes BuildRequires: gcc-c++ @@ -59,7 +61,6 @@ %package devel Summary: Development files for MyPaint -License: GPL-2.0+ Group: Development/Libraries/C and C++ Requires: %{name} = %{version} @@ -68,6 +69,9 @@ %prep %setup -q +%if 0%{?suse_version} > 1320 +%patch0 -p1 +%endif #FIXME Set correct library path for build arch sed -i 's|lib/mypaint|%{_lib}/mypaint|g' SConscript SConstruct mypaint.py @@ -102,29 +106,15 @@ %find_lang lib%{name} %fdupes %{buildroot} -%if 0%{?suse_version} >= 1140 - %post /sbin/ldconfig %desktop_database_post %icon_theme_cache_post -%else - -%post -/sbin/ldconfig -%endif - -%if 0%{?suse_version} >= 1140 %postun /sbin/ldconfig %desktop_database_postun %icon_theme_cache_postun -%else - -%postun -/sbin/ldconfig -%endif %files %defattr(-,root,root) ++++++ mypaint-scons-to-python3.patch ++++++ Index: mypaint-1.1.0/SConstruct =================================================================== --- mypaint-1.1.0.orig/SConstruct +++ mypaint-1.1.0/SConstruct @@ -13,7 +13,7 @@ if sys.platform == "win32": default_python_config = 'python-config' if os.path.exists('/etc/gentoo-release'): - print 'Gentoo: /etc/gentoo-release exists. Must be on a Gentoo based system.' + print('Gentoo: /etc/gentoo-release exists. Must be on a Gentoo based system.') default_python_config = 'python-config-%d.%d' % (sys.version_info[0],sys.version_info[1]) SConsignFile() # no .scsonsign into $PREFIX please @@ -80,7 +80,7 @@ env.Append(RPATH = env.Literal(os.path.j env.Execute('rm -f libmypaint-tests.so libmypaint.so libmypaintlib.so') set_dir_postaction = {} -def install_perms(env, target, sources, perms=0644, dirperms=0755): +def install_perms(env, target, sources, perms=0o644, dirperms=0o755): """As a normal env.Install, but with Chmod postactions. The `target` parameter must be a string which starts with ``$prefix``. @@ -109,7 +109,7 @@ def install_perms(env, target, sources, d_prev = None while d != d_prev and d != '$prefix': d_prev = d - if not set_dir_postaction.has_key(d): + if d not in set_dir_postaction: env.AddPostAction(file_targ, Chmod(d, dirperms)) set_dir_postaction[d] = True d = os.path.dirname(d) @@ -117,7 +117,7 @@ def install_perms(env, target, sources, return install_targs -def install_tree(env, dest, path, perms=0644, dirperms=0755): +def install_tree(env, dest, path, perms=0o644, dirperms=0o755): assert os.path.isdir(path) target_root = join(dest, os.path.basename(path)) for dirpath, dirnames, filenames in os.walk(path): Index: mypaint-1.1.0/SConscript =================================================================== --- mypaint-1.1.0.orig/SConscript +++ mypaint-1.1.0/SConscript @@ -10,9 +10,9 @@ mypaintlib = SConscript('lib/SConscript' languages = SConscript('po/SConscript') try: - new_umask = 022 + new_umask = 0o22 old_umask = os.umask(new_umask) - print "set umask to 0%03o (was 0%03o)" % (new_umask, old_umask) + print("set umask to 0%03o (was 0%03o)" % (new_umask, old_umask)) except OSError: # Systems like Win32... pass @@ -28,7 +28,7 @@ def burn_python_version(target, source, f.write(s) f.close() -env.Command('mypaint', 'mypaint.py', [burn_python_version, Chmod('$TARGET', 0755)]) +env.Command('mypaint', 'mypaint.py', [burn_python_version, Chmod('$TARGET', 0o755)]) AlwaysBuild('mypaint') # especially if the "python_binary" option was changed env.Clean('.', Glob('*.pyc')) @@ -49,7 +49,7 @@ install_perms(env, '$prefix/share/applic install_perms(env, '$prefix/lib/mypaint', mypaintlib) # Program and supporting UI XML -install_perms(env, '$prefix/bin', 'mypaint', perms=0755) +install_perms(env, '$prefix/bin', 'mypaint', perms=0o755) install_perms(env, '$prefix/share/mypaint/gui', Glob('gui/*.xml')) install_perms(env, "$prefix/share/mypaint/lib", Glob("lib/*.py")) install_perms(env, "$prefix/share/mypaint/gui", Glob("gui/*.py"))
