[ClanLib1] Fix building with new libpng

[Hans de Goede]

commit d9618153a61a940790849a28ff394eab4c84aa03
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Sun Dec 11 12:15:24 2011 +0100

    Fix building with new libpng

 ClanLib-1.0.0-libpng15.patch |   12 ++++++++++++
 ClanLib1.spec                |   11 +++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)
---
diff --git a/ClanLib-1.0.0-libpng15.patch b/ClanLib-1.0.0-libpng15.patch
new file mode 100644
index 0000000..ae2f335
--- /dev/null
+++ b/ClanLib-1.0.0-libpng15.patch
@@ -0,0 +1,12 @@
+diff -up ClanLib-1.0.0/Sources/Display/Providers/png_provider_generic.cpp~ ClanLib-1.0.0/Sources/Display/Providers/png_provider_generic.cpp
+--- ClanLib-1.0.0/Sources/Display/Providers/png_provider_generic.cpp~	2006-10-27 03:55:01.000000000 +0200
++++ ClanLib-1.0.0/Sources/Display/Providers/png_provider_generic.cpp	2011-12-11 12:02:40.534863690 +0100
+@@ -107,7 +107,7 @@ void CL_PNGProvider_Generic::init()
+ 		png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp) NULL);
+ 		cl_assert(false);
+ 	}   
+-	if (setjmp(png_ptr->jmpbuf))
++	if (setjmp(png_jmpbuf(png_ptr)))
+ 	{
+ 		png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
+ 		cl_assert(false);
diff --git a/ClanLib1.spec b/ClanLib1.spec
index ce28658..5aaa238 100644
--- a/ClanLib1.spec
+++ b/ClanLib1.spec
@@ -3,7 +3,7 @@
 Summary:        Cross platform C++ game library
 Name:           ClanLib1
 Version:        1.0.0
-Release:        7%{?dist}
+Release:        8%{?dist}
 Group:          System Environment/Libraries
 License:        zlib
 URL:            http://www.clanlib.org/
@@ -15,6 +15,7 @@ Source0:        http://www.clanlib.org/download/releases-1.0/%{realname}-%{versi
 Source1:        ClanLib-%{version}-generated-docs.tar.gz
 Patch0:         ClanLib-0.8.0-gcc43.patch
 Patch1:         ClanLib-1.0.0-fullscreen-viewport.patch
+Patch2:         ClanLib-1.0.0-libpng15.patch
 BuildRequires:  libX11-devel libXi-devel libXmu-devel libGLU-devel libICE-devel
 BuildRequires:  libXext-devel libXxf86vm-devel libXt-devel xorg-x11-proto-devel
 BuildRequires:  libvorbis-devel mikmod-devel SDL-devel SDL_gfx-devel
@@ -30,7 +31,7 @@ ClanLib is a cross platform C++ game library.
 %package devel
 Summary:        Development Libraries and Headers for ClanLib
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       libGLU-devel xorg-x11-proto-devel pkgconfig
 # Obsoletes for upgrade path, no Provides as "ClanLib-devel" will be provided
 # By the new ClanLib-devel-2.x package
@@ -44,6 +45,7 @@ ClanLib development headers and libraries
 %setup -q -a 1 -n %{realname}-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 iconv -f iso8859-1 -t utf8 NEWS -o NEWS.utf8
 touch -r NEWS.utf8 NEWS
 mv NEWS.utf8 NEWS
@@ -85,12 +87,10 @@ done
 
 
 %files
-%defattr(-,root,root,-)
 %doc COPYING CREDITS NEWS TODO-RSN
 %{_libdir}/*.so.*
 
 %files devel
-%defattr(-,root,root,-)
 %doc README* html
 %{_libdir}/%{realname}-1.0
 %{_includedir}/%{realname}-1.0
@@ -98,6 +98,9 @@ done
 
 
 %changelog
+* Sun Dec 11 2011 Hans de Goede <hdegoede at redhat.com> - 1.0.0-8
+- Fix building with new libpng
+
 * Tue Dec 06 2011 Adam Jackson <ajax at redhat.com> - 1.0.0-7
 - Rebuild for new libpng