[packages/mypaint] - updated to 1.2.1 - removed obsolete json-c-0.12 patch - added no-env patch (don't hide python behi

qboosh qboosh at pld-linux.org
Sat Jun 15 06:42:48 CEST 2019 

commit 49945c6a050fae3e1a249b27bd64c9332e54df6c
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Jun 15 06:43:53 2019 +0200

    - updated to 1.2.1
    - removed obsolete json-c-0.12 patch
    - added no-env patch (don't hide python behind /usr/bin/env)

 json-c-0.12.patch    | 11 -------
 mypaint-no-env.patch | 11 +++++++
 mypaint.spec         | 81 +++++++++++++++++++++++++++++-----------------------
 3 files changed, 57 insertions(+), 46 deletions(-)
---
diff --git a/mypaint.spec b/mypaint.spec
index 7dda3e4..0142b27 100644
--- a/mypaint.spec
+++ b/mypaint.spec
@@ -1,33 +1,39 @@
 Summary:	MyPaint is a fast and easy open-source graphics application for digital painters
 Summary(pl.UTF-8):	Szybka i łatwa w obsłudze aplikacja dla komputerowych malarzy.
 Name:		mypaint
-Version:	1.1.0
-Release:	5
+Version:	1.2.1
+Release:	1
 License:	GPL
 Group:		X11/Applications/Graphics
-Source0:	http://download.gna.org/mypaint/%{name}-%{version}.tar.bz2
-# Source0-md5:	7846a8406259d0fc81c9a2157a2348bf
-Patch0:		json-c-0.12.patch
-URL:		http://mypaint.intilinux.com/
+#Source0Download: https://github.com/mypaint/mypaint/releases
+Source0:	https://github.com/mypaint/mypaint/releases/download/v%{version}/%{name}-%{version}.tar.xz
+# Source0-md5:	ac08c3135929f5641488fbbb9746fe41
+Patch0:		%{name}-no-env.patch
+URL:		http://mypaint.org/
 BuildRequires:	gettext-tools
-BuildRequires:	gtk+2-devel
-BuildRequires:	json-c-devel
-BuildRequires:	lcms2-devel
+BuildRequires:	gtk+3-devel >= 3.10
+BuildRequires:	json-c-devel >= 0.11
+BuildRequires:	lcms2-devel >= 2
+BuildRequires:	libgomp-devel
 BuildRequires:	libpng-devel
+BuildRequires:	libstdc++-devel
 BuildRequires:	pkgconfig
+BuildRequires:	python >= 1:2.7
 BuildRequires:	python-numpy-numarray-devel
-BuildRequires:	python-pygobject-devel
+BuildRequires:	python-pygobject3-devel >= 3.0
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(find_lang) >= 1.32
-BuildRequires:	scons
+BuildRequires:	scons >= 2.1.0
 BuildRequires:	sed >= 4.0
 BuildRequires:	swig-python
+BuildRequires:	tar >= 1:1.22
+BuildRequires:	xz
 Requires:	desktop-file-utils
 Requires:	gtk-update-icon-cache
 Requires:	hicolor-icon-theme
 Requires:	python-numpy-numarray
-Requires:	python-pycairo
-Requires:	python-pygtk-gtk
+Requires:	python-pycairo >= 1.4
+Requires:	python-pygobject3 >= 3
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -64,19 +70,25 @@ ukrywania interfejsu użytkownika.
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 %scons install \
-	prefix=$RPM_BUILD_ROOT%{_prefix}
+	prefix=$RPM_BUILD_ROOT%{_prefix} \
+	python_binary=%{__python}
 
 # scons as always sucks and doesn't set +x bit
 chmod +x $RPM_BUILD_ROOT%{_libdir}/mypaint/_mypaintlib.so
 
-# not packaged
+# see libmypaint.spec
 %{__rm} -r $RPM_BUILD_ROOT%{_includedir}/libmypaint
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libmypaint.a
 %{__rm} $RPM_BUILD_ROOT%{_pkgconfigdir}/libmypaint.pc
+%{__rm} $RPM_BUILD_ROOT%{_localedir}/*/LC_MESSAGES/libmypaint.mo
+
+# duplicate of scalable?
+%{__rm} $RPM_BUILD_ROOT%{_iconsdir}/hicolor/24x24/actions/*.svg
 
-# unsupported
-%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/nn_NO
+# unify code
+%{__mv} $RPM_BUILD_ROOT%{_localedir}/{nn_NO,nn}
 
 %find_lang %{name}
 
@@ -93,36 +105,35 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc README changelog doc/*
+%doc Changelog.md Licenses.dep5 Licenses.md README.md doc/*
 %attr(755,root,root) %{_bindir}/mypaint
+%attr(755,root,root) %{_bindir}/mypaint-ora-thumbnailer
 %dir %{_libdir}/mypaint
-%attr(755,root,root) %{_libdir}/mypaint/*_mypaintlib.so
-%{_desktopdir}/mypaint.desktop
-%{_iconsdir}/hicolor/*/apps/mypaint.*
-%{_iconsdir}/hicolor/*/actions/*.*
-%dir %{_datadir}/mypaint
+%attr(755,root,root) %{_libdir}/mypaint/_mypaintlib.so
+%{_datadir}/appdata/mypaint.appdata.xml
+%dir %{_datadir}/libmypaint
+%{_datadir}/libmypaint/__init__.py
+%{_datadir}/libmypaint/brushsettings.py
+%{_datadir}/libmypaint/brushsettings.json
+%attr(755,root,root) %{_datadir}/libmypaint/generate.py
 %{_datadir}/mypaint/backgrounds
 %dir %{_datadir}/mypaint/brushes
 %{_datadir}/mypaint/brushes/FX_blender_prev.png
 %{_datadir}/mypaint/brushes/classic
 %{_datadir}/mypaint/brushes/deevad
 %{_datadir}/mypaint/brushes/experimental
+%{_datadir}/mypaint/brushes/kaerhon_v1
 %{_datadir}/mypaint/brushes/ramon
 %{_datadir}/mypaint/brushes/tanda
 %attr(755,root,root) %{_datadir}/mypaint/brushes/label-brush-mypaint.sh
 %{_datadir}/mypaint/brushes/order.conf
 %{_datadir}/mypaint/brushes/prev-template.xcf.gz
-%dir %{_datadir}/mypaint/brushlib
-%{_datadir}/mypaint/brushlib/__init__.py
-%{_datadir}/mypaint/brushlib/brushsettings.py
-%{_datadir}/mypaint/brushlib/brushsettings.json
-%attr(755,root,root) %{_datadir}/mypaint/brushlib/generate.py
-%dir %{_datadir}/mypaint/gui
-%{_datadir}/mypaint/gui/*.xml
-%{_datadir}/mypaint/gui/*.py
-%dir %{_datadir}/mypaint/gui/colors
-%{_datadir}/mypaint/gui/colors/*.py
-%dir %{_datadir}/mypaint/palettes
-%{_datadir}/mypaint/palettes/*.gpl
+%{_datadir}/mypaint/gui
+%{_datadir}/mypaint/palettes
 %{_datadir}/mypaint/lib
 %{_datadir}/mypaint/pixmaps
+%{_datadir}/thumbnailers/mypaint-ora.thumbnailer
+%{_desktopdir}/mypaint.desktop
+%{_iconsdir}/hicolor/*x*/apps/mypaint.png
+%{_iconsdir}/hicolor/*x*/actions/mypaint-tool-*.png
+%{_iconsdir}/hicolor/scalable/actions/mypaint-*.svg
diff --git a/json-c-0.12.patch b/json-c-0.12.patch
deleted file mode 100644
index 99751af..0000000
--- a/json-c-0.12.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mypaint-1.1.0/brushlib/SConscript~	2014-11-24 07:29:45.000000000 +0100
-+++ mypaint-1.1.0/brushlib/SConscript	2014-11-24 07:31:11.602008599 +0100
-@@ -73,7 +73,7 @@
- 
- env.Append(CPPPATH='./')
- 
--pkg_deps = ['json']
-+pkg_deps = ['json-c']
- libs = ['m']
- linkflags = []
- 
diff --git a/mypaint-no-env.patch b/mypaint-no-env.patch
new file mode 100644
index 0000000..5440407
--- /dev/null
+++ b/mypaint-no-env.patch
@@ -0,0 +1,11 @@
+--- mypaint-1.2.1/SConscript.orig	2019-06-14 21:24:06.546842951 +0200
++++ mypaint-1.2.1/SConscript	2019-06-14 21:36:27.089497753 +0200
+@@ -45,7 +45,7 @@
+         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.",
+             "#",
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mypaint.git/commitdiff/49945c6a050fae3e1a249b27bd64c9332e54df6c

More information about the pld-cvs-commit mailing list