[mtpaint] Add png patch

[terjeros]

commit 76f76de5684fde46dfd30c8542b44211c34fd895
Author: Terje Røsten <terje.rosten at ntnu.no>
Date:   Mon Nov 7 13:45:26 2011 +0100

    Add png patch

 mtpaint-3.31-png.patch |   20 ++++++++++++++++++++
 mtpaint.spec           |    7 ++++++-
 2 files changed, 26 insertions(+), 1 deletions(-)
---
diff --git a/mtpaint-3.31-png.patch b/mtpaint-3.31-png.patch
new file mode 100644
index 0000000..eb845d4
--- /dev/null
+++ b/mtpaint-3.31-png.patch
@@ -0,0 +1,20 @@
+--- mtpaint-3.31/src/png.c~	2009-02-05 11:39:16.000000000 +0100
++++ mtpaint-3.31/src/png.c	2011-11-07 13:38:08.000000000 +0100
+@@ -539,7 +539,7 @@
+ 	if (settings->bpp == 3)
+ 	{
+ 		png_set_strip_16(png_ptr);
+-		png_set_gray_1_2_4_to_8(png_ptr);
++		png_set_expand_gray_1_2_4_to_8(png_ptr);
+ 		png_set_palette_to_rgb(png_ptr);
+ 		png_set_gray_to_rgb(png_ptr);
+ 
+@@ -644,7 +644,7 @@
+ 		png_set_strip_alpha(png_ptr);
+ 		png_set_packing(png_ptr);
+ 		if ((color_type == PNG_COLOR_TYPE_GRAY) && (bit_depth < 8))
+-			png_set_gray_1_2_4_to_8(png_ptr);
++		        png_set_expand_gray_1_2_4_to_8(png_ptr);
+ 		for (i = 0; i < height; i++)
+ 		{
+ 			row_pointers[i] = settings->img[CHN_IMAGE] + i * width;
diff --git a/mtpaint.spec b/mtpaint.spec
index f85af42..e20e838 100644
--- a/mtpaint.spec
+++ b/mtpaint.spec
@@ -3,7 +3,7 @@
 Summary:       Painting program for creating icons and pixel-based artwork
 Name:          mtpaint
 Version:       3.31
-Release:       5%{?dist}
+Release:       6%{?dist}
 License:       GPLv3+
 Group:         Applications/Multimedia
 URL:           http://mtpaint.sourceforge.net/
@@ -12,6 +12,7 @@ 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
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gtk2-devel zlib-devel
 BuildRequires: libpng-devel giflib-devel libjpeg-devel libtiff-devel
@@ -40,6 +41,7 @@ application mtpaint.
 %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
@@ -102,6 +104,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %doc %{name}_handbook-%{docver}/COPYING %{name}_handbook-%{docver}/docs/*
 
 %changelog
+* Mon Nov 07 2011 Terje Rosten <terje.rosten at ntnu.no> - 3.31-6
+- Add png patch
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.31-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild