[gnome-xcf-thumbnailer] - Fix compilation agains libpng 1.5 - Spec cleanup

[Mohamed ElMorabity]

commit 856e7712e679a0e911c88988af03813e5dd25a34
Author: Mohamed El Morabity <melmorabity at fedoraproject.org>
Date:   Tue Dec 6 02:20:37 2011 +0100

    - Fix compilation agains libpng 1.5
    - Spec cleanup

 gnome-xcf-thumbnailer-1.0-libpng15.patch |   15 +++++++++++++++
 gnome-xcf-thumbnailer.spec               |   17 +++++++++--------
 2 files changed, 24 insertions(+), 8 deletions(-)
---
diff --git a/gnome-xcf-thumbnailer-1.0-libpng15.patch b/gnome-xcf-thumbnailer-1.0-libpng15.patch
new file mode 100644
index 0000000..e426c08
--- /dev/null
+++ b/gnome-xcf-thumbnailer-1.0-libpng15.patch
@@ -0,0 +1,15 @@
+diff -up gnome-xcf-thumbnailer-1.0/xcf2png.c.orig gnome-xcf-thumbnailer-1.0/xcf2png.c
+--- gnome-xcf-thumbnailer-1.0/xcf2png.c.orig	2006-02-13 01:09:10.000000000 +0100
++++ gnome-xcf-thumbnailer-1.0/xcf2png.c	2011-12-06 02:01:17.644264002 +0100
+@@ -71,9 +71,9 @@ init_output(void)
+   
+   outfile = openout(flatspec.output_filename);
+   libpng = png_create_write_struct(PNG_LIBPNG_VER_STRING,
+-                                   png_voidp_NULL,
++                                   NULL,
+                                    my_error_callback,
+-                                   png_error_ptr_NULL);
++                                   NULL);
+   if( !libpng )
+     FatalUnexpected(_("Couldn't initialize libpng library"));
+   
diff --git a/gnome-xcf-thumbnailer.spec b/gnome-xcf-thumbnailer.spec
index 7a8f3fa..fd6c98d 100644
--- a/gnome-xcf-thumbnailer.spec
+++ b/gnome-xcf-thumbnailer.spec
@@ -1,15 +1,16 @@
 Name:           gnome-xcf-thumbnailer
 Version:        1.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Thumbnailer for XCF files
 
 Group:          Amusements/Graphics
 License:        GPLv2+
 URL:            http://ftp.gnome.org/pub/GNOME/sources/gnome-xcf-thumbnailer/
-Source0:        http://download.gnome.org/sources/%{name}/%{name}-%{version}.tar.bz2
+Source0:        http://download.gnome.org/sources/%{name}/%{version}/%{name}-%{version}.tar.bz2
 # Fix CVE-2009-2175 (see RHBZ #647907)
 Patch0:         gnome-xcf-thumbnailer-1.0-CVE-2009-2175.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# Fix compilation against libpng 1.5
+Patch1:         gnome-xcf-thumbnailer-1.0-libpng15.patch
 
 BuildRequires:  GConf2
 BuildRequires:  glib2-devel
@@ -26,6 +27,7 @@ Thumbnailer for GIMP's own format, XCF files.
 %prep
 %setup -q
 %patch0 -p0 -b .CVE-2009-2175
+%patch1 -p1 -b .libpng15
 
 
 %build
@@ -35,14 +37,9 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %pre
 %gconf_schema_prepare %{name}
 
@@ -63,6 +60,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec 06 2011 Mohamed El Morabity <melmorabity at fedoraproject.org> - 1.0-7
+- Fix compilation agains libpng 1.5
+- Spec cleanup
+
 * Tue Dec 06 2011 Adam Jackson <ajax at redhat.com> - 1.0-6
 - Rebuild for new libpng