diff --git a/.gitignore b/.gitignore index 5e04548..667fca6 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ mypaint-0.8.2.tar.bz2 /Concept%20Design.zip /ramon2.zip /Concept_Design.zip +/mypaint-1.1.0.tar.bz2 diff --git a/mypaint-1.1.0-scons.patch b/mypaint-1.1.0-scons.patch new file mode 100644 index 0000000..2dc4c47 --- /dev/null +++ b/mypaint-1.1.0-scons.patch @@ -0,0 +1,38 @@ +--- 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 41a4118..9111022 100644 --- a/mypaint.spec +++ b/mypaint.spec @@ -1,8 +1,8 @@ %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: mypaint -Version: 1.0.0 -Release: 8%{?dist} +Version: 1.1.0 +Release: 1%{?dist} Summary: A fast and easy graphics application for digital painters Group: Applications/Multimedia @@ -18,6 +18,9 @@ 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 @@ -41,9 +44,20 @@ BuildArch: noarch The %{name}-data package contains common data files for %{name}. +%package devel +Summary: Development files for %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +The %{name}-devel package contains libraries and header files for +developing applications that use %{name}. + + %prep %setup -q -%patch0 -p1 +%patch0 -p1 -b .usrmove +%patch1 -p1 -b .scons # Ramon2 brushes unzip %{SOURCE1} -x order.conf -d brushes @@ -58,8 +72,11 @@ 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 + # for 64 bit -sed -i 's|lib/mypaint|%{_lib}/mypaint|g' SConstruct mypaint.py +sed -i 's|lib/mypaint|%{_lib}/mypaint|g' SConscript SConstruct mypaint.py +sed -i 's|lib/pkgconfig|%{_lib}/pkgconfig|g' SConscript brushlib/SConscript + # fix menu icon sed -i 's|mypaint_48|mypaint|g' desktop/%{name}.desktop @@ -71,8 +88,8 @@ scons prefix=%{_prefix} %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT -scons prefix=$RPM_BUILD_ROOT%{_prefix} install +rm -rf %{buildroot} +scons prefix=%{buildroot}%{_prefix} install desktop-file-install \ %if 0%{?fedora} && 0%{?fedora} < 19 @@ -80,18 +97,23 @@ desktop-file-install \ %endif --delete-original \ --remove-key="Encoding" \ - --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \ - $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop + --dir=%{buildroot}%{_datadir}/applications \ + %{buildroot}%{_datadir}/applications/%{name}.desktop + +# the SConscript is dumb and includes %%{buildroot}. Let's just strip it here. +sed -i 's|%{buildroot}||' %{buildroot}%{_libdir}/pkgconfig/libmypaint.pc -find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' +find %{buildroot} -name '*.la' -exec rm -f {} ';' +find %{buildroot} -name '*.a' -exec rm -f {} ';' -chmod 755 $RPM_BUILD_ROOT%{_libdir}/mypaint/_mypaintlib.so +chmod 755 %{buildroot}%{_libdir}/mypaint/_mypaintlib.so %find_lang %{name} +%find_lang libmypaint %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %post @@ -111,7 +133,7 @@ update-desktop-database &> /dev/null || : gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -%files -f %{name}.lang +%files -f %{name}.lang -f libmypaint.lang %defattr(-,root,root,-) %doc changelog COPYING LICENSE README README.CD_concept README.Ramon2 doc/ %{_bindir}/%{name} @@ -127,6 +149,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %defattr(-,root,root,-) %{_datadir}/%{name}/backgrounds %{_datadir}/%{name}/brushes +%{_datadir}/%{name}/palettes %{_datadir}/%{name}/pixmaps %if 0%{?fedora} && 0%{?fedora} < 19 %{_datadir}/applications/fedora-%{name}.desktop @@ -136,7 +159,18 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/*/*/* +%files devel +%defattr(-,root,root,-) +%doc +%{_includedir}/* +%{_libdir}/pkgconfig/libmypaint.pc + %changelog +* Tue Aug 13 2013 Christoph Wickert - 1.1.0-1 +- Update to 1.1.0 (#891044) +- New devel package to develop brushlibs +- Add patch to make mypaint honor compiler flags + * Sat Aug 03 2013 Fedora Release Engineering - 1.0.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild @@ -174,7 +208,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : * Wed Aug 11 2010 David Malcolm - 0.8.2-4 - recompiling .py files against Python 2.7 (rhbz#623339) -* Wed Jul 11 2010 Christoph Wickert - 0.8.2-3 +* 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 diff --git a/sources b/sources index 433d154..1d4f4fc 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -dcd43933746a4579e7994f506e097823 mypaint-1.0.0.tar.bz2 b7551bf926b4a6eba21e5c75de1bebab ramon2.zip fdd6b6f028d1ce9240ea084403d15ec4 Concept_Design.zip +7846a8406259d0fc81c9a2157a2348bf mypaint-1.1.0.tar.bz2