diff --git a/.gitignore b/.gitignore index 667fca6..848a8da 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ mypaint-0.8.2.tar.bz2 /ramon2.zip /Concept_Design.zip /mypaint-1.1.0.tar.bz2 +/mypaint-1.2.1.tar.xz diff --git a/0001-port-scons-files-to-python3.patch b/0001-port-scons-files-to-python3.patch new file mode 100644 index 0000000..00300e9 --- /dev/null +++ b/0001-port-scons-files-to-python3.patch @@ -0,0 +1,321 @@ +From dfa5684753e9609f4a598d77f04f1a80a27b0f34 Mon Sep 17 00:00:00 2001 +From: Sergey Avseyev +Date: Tue, 5 Dec 2017 11:37:26 +0300 +Subject: [PATCH] port scons files to python3 + +--- + SConscript | 18 +++++++++--------- + SConstruct | 20 ++++++++++---------- + brushlib/SConscript | 6 +++--- + lib/SConscript | 8 ++------ + lib/meta.py | 41 ++++++++++++++++++++--------------------- + 5 files changed, 44 insertions(+), 49 deletions(-) + +diff --git a/SConscript b/SConscript +index a5edfb0..195df1d 100644 +--- a/SConscript ++++ b/SConscript +@@ -6,7 +6,7 @@ from subprocess import check_output + # Pre-fight checks + + if not os.path.exists('brushlib/SConscript'): +- print >>sys.stderr, """ ++ print(""" + ---------------------------------------------------------------------- + + Missing submodule "brushlib" +@@ -15,7 +15,7 @@ Please run "git submodule update --init" to create it. See the README + for more information. + + ---------------------------------------------------------------------- +-""" ++""", file=sys.stderr) + sys.exit(2) + + Import('env', 'install_perms', 'install_tree') +@@ -27,9 +27,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 +@@ -56,13 +56,13 @@ def burn_versions(env, target, source): + relinfo_script = relinfo_script, + source = source[0], + ) +- with open(unicode(target[0]), 'w') as output: ++ with open(str(target[0]), 'w') as output: + output.write(header) +- with open(unicode(source[0])) as input: ++ with open(str(source[0])) as input: + output.write(input.read()) + c = env.Command(target, source, [ + _burn_versions, +- Chmod(target, 0755), ++ Chmod(target, 0o755), + ]) + d = env.Depends(target, env.Value(env["python_binary"])) + # But don't depend on the git output: +@@ -92,7 +92,7 @@ if os.name == "posix": + install_perms(env, + '$prefix/bin', + 'desktop/mypaint-ora-thumbnailer', +- perms=0755, ++ perms=0o755, + ) + install_perms(env, + '$prefix/share/thumbnailers', +@@ -125,7 +125,7 @@ install_perms(env, '$prefix/share/appdata', 'desktop/mypaint.appdata.xml') + 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/gui', Glob('gui/*.glade')) + install_perms(env, "$prefix/share/mypaint/lib", Glob("lib/*.py")) +diff --git a/SConstruct b/SConstruct +index 6dc6c50..36b3d58 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -17,7 +17,7 @@ elif sys.platform == "msys" and os.environ.get("MSYSTEM") != "MSYS": + # Defaults above will work fine. + pass + elif 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 +@@ -76,18 +76,18 @@ if not env.GetOption("help"): + # Respect some standard build environment stuff + # See http://cgit.freedesktop.org/mesa/mesa/tree/scons/gallium.py + # See https://wiki.gentoo.org/wiki/SCons#Missing_CC.2C_CFLAGS.2C_LDFLAGS +-if os.environ.has_key('CC'): ++if 'CC' in os.environ: + env['CC'] = os.environ['CC'] +-if os.environ.has_key('CFLAGS'): ++if 'CFLAGS' in os.environ: + env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS']) +-if os.environ.has_key('CXX'): ++if 'CXX' in os.environ: + env['CXX'] = os.environ['CXX'] +-if os.environ.has_key('CXXFLAGS'): ++if 'CXXFLAGS' in os.environ: + env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS']) +-if os.environ.has_key('CPPFLAGS'): ++if 'CPPFLAGS' in os.environ: + env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CPPFLAGS']) + env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CPPFLAGS']) +-if os.environ.has_key('LDFLAGS'): ++if 'LDFLAGS' in os.environ: + # LDFLAGS is omitted in SHLINKFLAGS, which is derived from LINKFLAGS + env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS']) + if "$CCFLAGS" in env['CXXCOM']: +@@ -146,7 +146,7 @@ env.Execute(Delete([ + + + 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 starting with ``$prefix``. +@@ -178,7 +178,7 @@ def install_perms(env, target, sources, perms=0644, dirperms=0755): + 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): +@@ -228,7 +228,7 @@ env.Alias('install', '$prefix') + Export('env', 'install_tree', 'install_perms') + + if not env.GetOption("help"): +- print "Enabling i18n for brushlib in full application build" ++ print("Enabling i18n for brushlib in full application build") + env['enable_i18n'] = True + + # Brushlib +diff --git a/brushlib/SConscript b/brushlib/SConscript +index f033c39..993627a 100644 +--- a/brushlib/SConscript ++++ b/brushlib/SConscript +@@ -81,8 +81,8 @@ env = env.Clone() + if env['enable_introspection']: + env['use_glib'] = True + env['use_sharedlib'] = True +- print "Enabling glib because of enable_introspection=true" +- print "Building a shared lib instead of a static lib because of enable_introspection=true" ++ print("Enabling glib because of enable_introspection=true") ++ print("Building a shared lib instead of a static lib because of enable_introspection=true") + + Export('env') + +@@ -95,7 +95,7 @@ env.Append(CPPDEFINES='HAVE_JSON_C') + json_pkgconfig = 'json-c' + + if subprocess.call(["pkg-config", json_pkgconfig]): +- print "Could not find 'json-c' pkg-config, trying legacy 'json' instead" ++ print("Could not find 'json-c' pkg-config, trying legacy 'json' instead") + json_pkgconfig = 'json' + + pkg_deps = [json_pkgconfig] +diff --git a/lib/SConscript b/lib/SConscript +index 377b859..609171c 100644 +--- a/lib/SConscript ++++ b/lib/SConscript +@@ -109,13 +109,9 @@ if env.get("numpy_include"): + # syntax too much, causing os.path.join() to fail. + + if not numpy_path: +- numpy_cfg_py = "import numpy; print numpy.get_include()" ++ numpy_cfg_py = "import numpy; print(numpy.get_include())" + try: +- numpy_path = subprocess.check_output([ +- env["python_binary"], +- "-c", +- numpy_cfg_py, +- ]) ++ numpy_path = subprocess.getoutput("%s -c %r" % (env["python_binary"], numpy_cfg_py)) + except: + numpy_path = None + else: +diff --git a/lib/meta.py b/lib/meta.py +index 568b99a..b187e34 100644 +--- a/lib/meta.py ++++ b/lib/meta.py +@@ -6,6 +6,8 @@ + # the Free Software Foundation; either version 2 of the License, or + # (at your option) any later version. + ++from __future__ import print_function ++ + """GUI-independent project meta-information. + + Version Strings +@@ -95,7 +97,6 @@ artefacts. + + """ + +- + #: Program name, for display. + #: Not marked for translation, but that can change if it enhances things. + +@@ -135,6 +136,7 @@ def _get_versions(gitprefix="gitexport"): + import os + import sys + import subprocess ++ + # Establish some fallbacks for use when there's no .git present, + # or no release_info. + base_version = MYPAINT_VERSION +@@ -144,7 +146,8 @@ def _get_versions(gitprefix="gitexport"): + # If release information from release.sh exists, use that + relinfo = {} + with open("release_info", "rb") as relinfo_fp: +- exec relinfo_fp in relinfo ++ code = compile(relinfo_fp.read(), "release_info", "exec") ++ exec(code) in relinfo + base_version = relinfo.get( + "MYPAINT_VERSION_BASE", + base_version, +@@ -165,10 +168,10 @@ def _get_versions(gitprefix="gitexport"): + try: + objsha = str(subprocess.check_output(cmd)).strip() + except: +- print >>sys.stderr, ( ++ print(( + "ERROR: Failed to invoke %r. " + "Build will be marked as unsupported." +- ) % (" ".join(cmd),) ++ ) % (" ".join(cmd),), file=sys.stderr) + else: + build_ids = [gitprefix, objsha] + build_metadata = ".".join(build_ids) +@@ -182,10 +185,10 @@ def _get_versions(gitprefix="gitexport"): + try: + git_desc = str(subprocess.check_output(cmd)).strip() + except: +- print >>sys.stderr, ( ++ print(( + "ERROR: Failed to invoke %r. " + "Build will be marked as unsupported." +- ) % (" ".join(cmd),) ++ ) % (" ".join(cmd),), file=sys.stderr) + else: + # If MYPAINT_VERSION matches the most recent tag in git, + # then use the extra information from `git describe`. +@@ -204,7 +207,7 @@ def _get_versions(gitprefix="gitexport"): + if match: + (nrevs, objsha, dirty) = match.groups() + else: +- print >>sys.stderr, ( ++ print( + "WARNING: Failed to parse output of \"{cmd}\". " + "The base MYPAINT_VERSION ({ver}) from the code " + "should be present in the output of this command " +@@ -213,37 +216,33 @@ def _get_versions(gitprefix="gitexport"): + cmd = " ".join(cmd), + git_desc = repr(git_desc), + ver = base_version, +- ) +- ) +- print >>sys.stderr, ( ++ ), file=sys.stderr) ++ print( + "HINT: make sure you have the most recent tags: " +- "git fetch --tags" +- ) ++ "git fetch --tags", file=sys.stderr) + cmd = ["git", "rev-parse", "--short", "HEAD"] +- print >>sys.stderr, ( ++ print( + "WARNING: falling back to using just \"{cmd}\"." + .format( + cmd = " ".join(cmd), +- ) +- ) ++ ), file=sys.stderr) + try: + cmdout = str(subprocess.check_output(cmd)).strip() + except: +- print >>sys.stderr, ( ++ print(( + "ERROR: Failed to invoke %r. " + "Build will be marked as unsupported." +- ) % (" ".join(cmd),) ++ ) % (" ".join(cmd),), file=sys.stderr) + if re.match(r'^([0-9a-f]{7,})$', cmdout, re.I): + objsha = cmdout + else: +- print >>sys.stderr, ( ++ print( + "WARNING: Output of {cmd} ({output}) " + "does not look like a git revision SHA." + .format( + cmd = " ".join(cmd), + output = cmdout, +- ), +- ) ++ ), file=sys.stderr) + # nrevs is None or zero if this commit is the matched tag. + # If not, then incorporate the numbers somehow. + if nrevs and int(nrevs)>0: +@@ -310,4 +309,4 @@ def _get_release_info_script(gitprefix="gitexport"): + # makes. + + if __name__ == '__main__': +- print _get_release_info_script(), ++ print(_get_release_info_script()) +-- +2.13.6 + diff --git a/0002-fix-shebang-on-binaries.patch b/0002-fix-shebang-on-binaries.patch new file mode 100644 index 0000000..4edf0d6 --- /dev/null +++ b/0002-fix-shebang-on-binaries.patch @@ -0,0 +1,25 @@ +From bbe577e843d0956f2743d9f9a9f000f6a390d978 Mon Sep 17 00:00:00 2001 +From: Sergey Avseyev +Date: Wed, 6 Dec 2017 14:05:51 +0300 +Subject: [PATCH] fix shebang on binaries + +--- + SConscript | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/SConscript b/SConscript +index 195df1d..dcfabbf 100644 +--- a/SConscript ++++ b/SConscript +@@ -45,7 +45,7 @@ def burn_versions(env, target, source): + import lib.meta + relinfo_script = lib.meta._get_release_info_script(gitprefix="git") + header = "\n".join([ +- "#!/usr/bin/env {python_binary}", ++ "#!{python_binary}", + "#", + "# ***DO NOT EDIT THIS FILE***: edit {source} instead.", + "#", +-- +2.13.6 + diff --git a/mypaint-1.0.0-usrmove.patch b/mypaint-1.0.0-usrmove.patch deleted file mode 100644 index bb563fb..0000000 --- a/mypaint-1.0.0-usrmove.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur mypaint-1.0.0.orig/mypaint.py mypaint-1.0.0/mypaint.py ---- mypaint-1.0.0.orig/mypaint.py 2011-11-22 21:27:03.000000000 +0100 -+++ mypaint-1.0.0/mypaint.py 2012-09-26 16:46:20.507359964 +0200 -@@ -59,7 +59,7 @@ - sys.argv_unicode = win32_unicode_argv() - else: - sys.argv_unicode = [s.decode(sys.getfilesystemencoding()) for s in sys.argv] -- scriptdir=os.path.dirname(sys.argv_unicode[0]) -+ scriptdir=os.path.dirname(os.path.realpath(sys.argv_unicode[0])) - - # this script is installed as $prefix/bin. We just need $prefix to continue. - #pwd=os.getcwd() # why???? diff --git a/mypaint-1.1.0-scons.patch b/mypaint-1.1.0-scons.patch deleted file mode 100644 index 2dc4c47..0000000 --- a/mypaint-1.1.0-scons.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- mypaint-1.1.0.orig/SConstruct 2012-12-31 18:03:38.000000000 +0100 -+++ mypaint-1.1.0/SConstruct 2013-06-06 07:44:48.780203865 +0200 -@@ -1,6 +1,7 @@ - import os, sys - from os.path import join, basename - from SCons.Script.SConscript import SConsEnvironment -+import SCons.Util - - EnsureSConsVersion(1, 0) - -@@ -45,6 +46,27 @@ - if sys.platform == "win32": - # remove this mingw if trying VisualStudio - env = Environment(tools=tools + ['mingw'], ENV=os.environ, options=opts) -+ -+# Respect some standard build environment stuff -+# See http://cgit.freedesktop.org/mesa/mesa/tree/scons/gallium.py -+# See https://wiki.gentoo.org/wiki/SCons#Missing_CC.2C_CFLAGS.2C_LDFLAGS -+if os.environ.has_key('CC'): -+ env['CC'] = os.environ['CC'] -+if os.environ.has_key('CFLAGS'): -+ env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS']) -+if os.environ.has_key('CXX'): -+ env['CXX'] = os.environ['CXX'] -+if os.environ.has_key('CXXFLAGS'): -+ env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS']) -+if os.environ.has_key('CPPFLAGS'): -+ env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CPPFLAGS']) -+ env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CPPFLAGS']) -+if os.environ.has_key('LDFLAGS'): -+ # LDFLAGS is omitted in SHLINKFLAGS, which is derived from LINKFLAGS -+ env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS']) -+if "$CCFLAGS" in env['CXXCOM']: -+ env['CXXCOM'] = env['CXXCOM'].replace("$CCFLAGS","") -+ - opts.Update(env) - - env.Append(CXXFLAGS=' -Wall -Wno-sign-compare -Wno-write-strings') diff --git a/mypaint.spec b/mypaint.spec index b530e6f..2414b3c 100644 --- a/mypaint.spec +++ b/mypaint.spec @@ -1,46 +1,49 @@ -%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} - Name: mypaint -Version: 1.1.0 -Release: 15%{?dist} +Version: 1.2.1 +Release: 1%{?dist} Summary: A fast and easy graphics application for digital painters -Group: Applications/Multimedia # MyPaint is GPLv2+, brush library LGPLv2+ # Ramon and CD_concept brushes are CC-BY License: GPLv2+ and LGPLv2+ and CC-BY -URL: http://mypaint.intilinux.com/ -Source0: http://download.gna.org/mypaint/%{name}-%{version}.tar.bz2 -Source1: http://mypaintatelier.googlecode.com/files/ramon2.zip -# taken from http://mypaintatelier.googlecode.com/files/Concept%20Design.zip +URL: http://mypaint.org +Source0: https://github.com/mypaint/mypaint/releases/download/v%{version}/%{name}-%{version}.tar.xz +Source1: https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/mypaintatelier/ramon2.zip +# taken from https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/mypaintatelier/Concept%20Design.zip # but koji doesn't like sources with a whitespace, so we rename it Source2: Concept_Design.zip -# don't allow a prefix of "/" and assum a prefix of "/usr" instead -# occurs with a usrmoved system -Patch0: mypaint-1.0.0-usrmove.patch -# Upstream bug: https://gna.org/bugs/?20754 -# Upstream fix: https://gitorious.org/mypaint/mypaint/commit/c006e4e -Patch1: mypaint-1.1.0-scons.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: python-devel, gtk2-devel, pygtk2-devel -BuildRequires: json-c-devel -BuildRequires: protobuf-devel -BuildRequires: lcms2-devel -BuildRequires: numpy, scons, swig -BuildRequires: desktop-file-utils, gettext, intltool -Requires: gtk2, numpy, pygtk2, python, protobuf-python + +# https://github.com/mypaint/mypaint/pull/880 +Patch0: 0001-port-scons-files-to-python3.patch +Patch1: 0002-fix-shebang-on-binaries.patch + +BuildRequires: python2-devel +BuildRequires: scons >= 3.0, swig, desktop-file-utils, gettext, intltool +BuildRequires: python2dist(numpy) +BuildRequires: pkgconfig(pygtk-2.0) +BuildRequires: pkgconfig(json-c) +BuildRequires: pkgconfig(pygobject-3.0) +BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(lcms2) +BuildRequires: pkgconfig(libpng) +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(protobuf) + +Requires: python2 +Requires: pygtk2 +Requires: python2dist(numpy) +Requires: python2dist(protobuf) Requires: %{name}-data = %{version}-%{release} %description -MyPaint is a fast and easy graphics application for digital painters. It lets -you focus on the art instead of the program. You work on your canvas with +MyPaint is a fast and easy graphics application for digital painters. It lets +you focus on the art instead of the program. You work on your canvas with minimum distractions, bringing up the interface only when you need it. %package data Summary: Common data files for for %{name} -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} BuildArch: noarch %description data @@ -50,7 +53,7 @@ The %{name}-data package contains common data files for %{name}. %package devel Summary: Development files for %{name} Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description devel The %{name}-devel package contains libraries and header files for @@ -58,118 +61,58 @@ developing applications that use %{name}. %prep -%setup -q -%patch0 -p1 -b .usrmove -%patch1 -p1 -b .scons - -%if 0%{?fedora} >= 21 -# json.pc is now named json-c.pc beginning with json-c-devel-0.12 -sed -i "s/pkg_deps = \['json'\]/pkg_deps = \['json-c'\]/g" \ - brushlib/SConscript -%endif +%autosetup -p1 # Ramon2 brushes unzip %{SOURCE1} -x order.conf -d brushes unzip -p %{SOURCE1} order.conf >> brushes/order.conf -mv brushes/readme.txt README.Ramon2 +sed 's/\r$//' brushes/readme.txt > README.Ramon2 +rm brushes/readme.txt # Concept Design brushes unzip %{SOURCE2} -x order.conf -d brushes unzip -p %{SOURCE2} order.conf >> brushes/order.conf -mv brushes/readme.txt README.CD_concept - -# the Options class is deprecated; use the Variables class instead -sed -i 's|PathOption|PathVariable|g' SConstruct -sed -i 's|Options|Variables|g' SConstruct +sed 's/\r$//' brushes/readme.txt > README.CD_concept +rm brushes/readme.txt # for 64 bit sed -i 's|lib/mypaint|%{_lib}/mypaint|g' SConscript SConstruct mypaint.py sed -i 's|lib/pkgconfig|%{_lib}/pkgconfig|g' SConscript brushlib/SConscript +sed -i "s|'lib', 'mypaint'|'%{_lib}', 'mypaint'|" mypaint.py -# fix menu icon -sed -i 's|mypaint_48|mypaint|g' desktop/%{name}.desktop - +# don't set RPATH +sed -i 's|env.Append.*RPATH.*|pass #\0|' SConstruct %build -export CFLAGS="$RPM_OPT_FLAGS" -export CXXFLAGS="$RPM_OPT_FLAGS" -scons prefix=%{_prefix} %{?_smp_mflags} - +export CFLAGS="%{optflags}" +export CXXFLAGS="%{optflags}" +scons python_binary=%{__python2} \ + python_config=%{__python2}-config \ + prefix=%{_prefix} \ + %{?_smp_mflags} %install -rm -rf %{buildroot} -scons prefix=%{buildroot}%{_prefix} install - +scons python_binary=%{__python2} \ + python_config=%{__python2}-config \ + prefix=%{buildroot}%{_prefix} \ + install desktop-file-install \ -%if 0%{?fedora} && 0%{?fedora} < 19 - --vendor="fedora" \ -%endif - --delete-original \ - --remove-key="Encoding" \ --dir=%{buildroot}%{_datadir}/applications \ %{buildroot}%{_datadir}/applications/%{name}.desktop -# Register as an application to be visible in the software center -# -# NOTE: It would be *awesome* if this file was maintained by the upstream -# project, translated and installed into the right place during `make install`. -# -# See http://www.freedesktop.org/software/appstream/docs/ for more details. -# -mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata -cat > $RPM_BUILD_ROOT%{_datadir}/appdata/%{name}.appdata.xml < - - - - mypaint.desktop - CC0-1.0 - -

- MyPaint is a fast and easy open-source graphics application for digital painters. - It lets you focus on the art instead of the program. - You work on your canvas with minimum distractions, bringing up the interface - only when you need it. -

-

- MyPaint's brush engine is fast and almost infinitely configurable to simulate - many natural media brushes or experimental ‘unrealistic’ ones. - It ships with a variety of pre-made brushes by prominent artists so you don't - have to configure your own if you don't want to. -

- - http://mypaint.intilinux.com/ - - https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/mypaint/a.png - https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/mypaint/b.png - https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/mypaint/c.png - https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/mypaint/d.png - - - -EOF - # the SConscript is dumb and includes %%{buildroot}. Let's just strip it here. sed -i 's|%{buildroot}||' %{buildroot}%{_libdir}/pkgconfig/libmypaint.pc find %{buildroot} -name '*.la' -exec rm -f {} ';' find %{buildroot} -name '*.a' -exec rm -f {} ';' -chmod 755 %{buildroot}%{_libdir}/mypaint/_mypaintlib.so +chmod 755 %{buildroot}%{_libdir}/%{name}/_mypaintlib.so \ + %{buildroot}%{_datadir}/%{name}/brushes/label-brush-mypaint.sh %find_lang %{name} %find_lang libmypaint -%clean -rm -rf %{buildroot} - - %post data touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : update-desktop-database &> /dev/null || : @@ -186,33 +129,31 @@ update-desktop-database &> /dev/null || : %posttrans data gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - %files -f %{name}.lang -f libmypaint.lang -%defattr(-,root,root,-) -%doc changelog COPYING LICENSE README README.CD_concept README.Ramon2 doc/ +%doc Changelog.md README.md README.CD_concept README.Ramon2 %{_bindir}/%{name} -%dir %{_libdir}/mypaint/ -%{_libdir}/mypaint/_mypaintlib.so +%{_bindir}/%{name}-ora-thumbnailer +%{_datadir}/thumbnailers +%{_libdir}/%{name} +%license COPYING %files data -%defattr(-,root,root,-) -%{_datadir}/%{name}/ -%if 0%{?fedora} && 0%{?fedora} < 19 -%{_datadir}/applications/fedora-%{name}.desktop -%else +%{_datadir}/%{name} +%{_datadir}/lib%{name} %{_datadir}/appdata/%{name}.appdata.xml %{_datadir}/applications/%{name}.desktop -%endif -%{_datadir}/icons/hicolor/*/*/* +%{_datadir}/icons/hicolor/*/apps/%{name}.png +%{_datadir}/icons/hicolor/*/actions/%{name}* %files devel -%defattr(-,root,root,-) -%doc -%{_includedir}/* +%{_includedir} %{_libdir}/pkgconfig/libmypaint.pc %changelog +* Tue Dec 05 2017 Sergey Avseyev - 1.2.1-1 +- Update to 1.2.1 + * Thu Aug 03 2017 Fedora Release Engineering - 1.1.0-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild @@ -301,7 +242,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : * Wed Aug 11 2010 Christoph Wickert - 0.8.2-3 - Rebuild for Python 2.7 (#623339) - + * Fri Apr 16 2010 Christoph Wickert - 0.8-2-2 - Rebuild (fixes 583156) diff --git a/sources b/sources index 1d4f4fc..6f58a01 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -b7551bf926b4a6eba21e5c75de1bebab ramon2.zip -fdd6b6f028d1ce9240ea084403d15ec4 Concept_Design.zip -7846a8406259d0fc81c9a2157a2348bf mypaint-1.1.0.tar.bz2 +SHA512 (Concept_Design.zip) = 4ad2459da66e85f99911933323780aac0c223b1d0f860d3c768cff9add1ccf6fdd9149549b480bdc0c270059e3be068686f17845e472d2a658e75cb0cb7b3458 +SHA512 (mypaint-1.2.1.tar.xz) = 1783765e495b9535669a83a29d27ba684e6201fdfe0875bdd2c167b1dab8af05993b19025767fe0b2770ed9e578e4709f75d8a4820ac945812cba85609f9eb9b +SHA512 (ramon2.zip) = bdbeb2584ef635670e6c93d239c690dd8c785acde5b443d1e533ab98fa8fba05597f06423f7c6a7742f1ea490072a9b0ca6981253f842795cc0f22d61bb6e64c