[mtpaint] Update to 3.40

Mon Jan 30 17:41:01 UTC 2012

commit 7d5194b0be5e5a0a88433a42180457c914c3ff3f
Author: Terje Røsten <terje.rosten at ntnu.no>
Date:   Mon Jan 30 18:40:56 2012 +0100

    Update to 3.40

 .gitignore                                         |    2 +
 mtpaint-3.19-openjpeg.patch                        |   11 ----
 mtpaint-3.31-dso.patch                             |   12 ----
 ...9-xdg-open.patch => mtpaint-3.40-xdg-open.patch |    8 ++-
 mtpaint.spec                                       |   57 ++++++++++++--------
 sources                                            |    4 +-
 6 files changed, 44 insertions(+), 50 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 889c022..be21ad4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 mtpaint-3.31.tar.bz2
 mtpaint_handbook-3.31.zip
+/mtpaint-3.40.tar.bz2
+/mtpaint_handbook-3.40.zip
diff --git a/mtpaint-3.19-xdg-open.patch b/mtpaint-3.40-xdg-open.patch
similarity index 53%
rename from mtpaint-3.19-xdg-open.patch
rename to mtpaint-3.40-xdg-open.patch
index 0c3deb6..3ae3ba8 100644
--- a/mtpaint-3.19-xdg-open.patch
+++ b/mtpaint-3.40-xdg-open.patch
@@ -1,6 +1,8 @@
---- mtpaint-3.19/src/png.c~	2007-11-11 16:48:32.000000000 +0100
-+++ mtpaint-3.19/src/png.c	2007-12-16 23:33:19.000000000 +0100
-@@ -3990,7 +3990,7 @@
+diff --git a/src/spawn.c b/src/spawn.c
+index cef46b3..82fb753 100644
+--- a/src/spawn.c
++++ b/src/spawn.c
+@@ -757,7 +757,7 @@ int run_def_action(int action, char *sname, char *dname, int delay)
  
  #else /* Linux */
  
diff --git a/mtpaint.spec b/mtpaint.spec
index 9ff0d56..87bcd77 100644
--- a/mtpaint.spec
+++ b/mtpaint.spec
@@ -1,22 +1,29 @@
-%global docver 3.31
+%global docver 3.40
 
 Summary:       Painting program for creating icons and pixel-based artwork
 Name:          mtpaint
-Version:       3.31
-Release:       7%{?dist}
+Version:       3.40
+Release:       1%{?dist}
 License:       GPLv3+
 Group:         Applications/Multimedia
 URL:           http://mtpaint.sourceforge.net/
 Source0:       http://downloads.sf.net/%{name}/%{name}-%{version}.tar.bz2
 Source1:       http://downloads.sf.net/%{name}/%{name}_handbook-%{docver}.zip
-Patch0:        %{name}-3.19-xdg-open.patch
-Patch1:        %{name}-3.19-openjpeg.patch
-Patch2:        %{name}-3.31-dso.patch
-Patch3:        %{name}-3.31-png.patch
+Patch0:        mtpaint-3.40-xdg-open.patch
+Patch1:        mtpaint-3.31-png.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: gtk2-devel zlib-devel
-BuildRequires: libpng-devel giflib-devel libjpeg-devel libtiff-devel
-BuildRequires: desktop-file-utils gettext dos2unix
+BuildRequires: giflib-devel
+BuildRequires: gtk2-devel
+BuildRequires: lcms2-devel
+BuildRequires: libpng-devel
+BuildRequires: libjpeg-devel
+BuildRequires: libtiff-devel
+BuildRequires: openjpeg-devel
+BuildRequires: zlib-devel
+BuildRequires: desktop-file-utils
+BuildRequires: gettext
+BuildRequires: dos2unix
+Requires:      ImageMagick
 
 %description 
 mtPaint is a simple painting program designed for creating icons and
@@ -25,14 +32,14 @@ and offers basic painting and palette manipulation tools. Its main
 file format is PNG, although it can also handle JPEG, GIF, TIFF, BMP,
 XPM, and XBM files.
 
-%package handbook
-Summary:  Handbook for the mtpaint painting application
-Group:    Applications/Multimedia
-License:  GFDL
-Requires: %{name} = %{version}-%{release}
-BuildArch: noarch
+%package       handbook
+Summary:       Handbook for the mtpaint painting application
+Group:         Applications/Multimedia
+License:       GFDL
+Requires:      %{name} = %{version}-%{release}
+BuildArch:     noarch
 
-%description handbook
+%description   handbook
 Install this package is want to read the handbook for the painting
 application mtpaint.
 
@@ -40,11 +47,9 @@ application mtpaint.
 %setup -q -a 1
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 # We have moved docs
-%{__sed} -i 's,"/usr/doc/mtpaint/index.html","%{_docdir}/%{name}-handbook-%{version}/index.html",' src/png.c
+%{__sed} -i 's,"/usr/doc/mtpaint/index.html","%{_docdir}/%{name}-handbook-%{version}/index.html",' src/spawn.c
 
 %{__chmod} 0755 %{name}_handbook-%{docver}/docs/{en_GB,img,files,cs}
 dos2unix -k %{name}_handbook-%{docver}/docs/index.html
@@ -52,14 +57,19 @@ dos2unix -k %{name}_handbook-%{docver}/docs/{en_GB,cs}/*.html
 
 %build
 # This is not a "normal" configure
-%configure cflags asneeded debug intl man gtk2 tiff jpeg GIF
+export CFLAGS="%{optflags}"
+./configure \
+    --prefix=%{_prefix} \
+    --docdir=%{_docdir}/%{name}-%{version} \
+    cflags asneeded intl man thread gtk2 GIF tiff jpeg jp2 imagick lcms2
 %{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -rf %{buildroot}
 %{__make} install MT_PREFIX=%{buildroot}%{_prefix}            \
-                  MT_MAN_DEST=%{buildroot}%{_mandir}/man1     \
+                  MT_MAN_DEST=%{buildroot}%{_mandir}          \
                   MT_LANG_DEST=%{buildroot}%{_datadir}/locale \
+                  MT_DATAROOT=%{buildroot}%{_datadir}         \
                   BIN_INSTALL=%{buildroot}%{_bindir}
 
 desktop-file-install --delete-original         \
@@ -104,6 +114,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %doc %{name}_handbook-%{docver}/COPYING %{name}_handbook-%{docver}/docs/*
 
 %changelog
+* Sun Jan 29 2012 Terje Rosten <terje.rosten at ntnu.no> - 3.40-1
+- Update to 3.40
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.31-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index 4f08937..a629c99 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-fbe34eb25f96b6092403115f1f6ab387  mtpaint-3.31.tar.bz2
-40de347afa76e869f8251eb6134c3065  mtpaint_handbook-3.31.zip
+957c8035dd62c6bfdb594cd0a4467d22  mtpaint-3.40.tar.bz2
+d375790c951a90329e708c6ffc517b44  mtpaint_handbook-3.40.zip
