[bolzplatz2006] Fix building with new libpng

[Hans de Goede]

commit 0f39c0ebdcdf86089ac813fca08209100c458453
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Wed Dec 14 11:07:21 2011 +0100

    Fix building with new libpng

 bolzplatz2006-1.0.3-libpng15.patch |   12 ++++++++++++
 bolzplatz2006.spec                 |   29 +++++++++++++----------------
 2 files changed, 25 insertions(+), 16 deletions(-)
---
diff --git a/bolzplatz2006-1.0.3-libpng15.patch b/bolzplatz2006-1.0.3-libpng15.patch
new file mode 100644
index 0000000..1c6168c
--- /dev/null
+++ b/bolzplatz2006-1.0.3-libpng15.patch
@@ -0,0 +1,12 @@
+diff -up bolzplatz2006-1.0.3/libsrc/irrlicht-0.14-patched/CImageLoaderPNG.cpp~ bolzplatz2006-1.0.3/libsrc/irrlicht-0.14-patched/CImageLoaderPNG.cpp
+--- bolzplatz2006-1.0.3/libsrc/irrlicht-0.14-patched/CImageLoaderPNG.cpp~	2011-12-14 09:59:39.000000000 +0100
++++ bolzplatz2006-1.0.3/libsrc/irrlicht-0.14-patched/CImageLoaderPNG.cpp	2011-12-14 11:02:13.931050272 +0100
+@@ -42,7 +42,7 @@ void user_read_data_fcn(png_structp png_
+    png_size_t check; 
+ 
+    // changed by zola { 
+-   irr::io::IReadFile* file=(irr::io::IReadFile*)png_ptr->io_ptr; 
++   irr::io::IReadFile* file=(irr::io::IReadFile*)png_get_io_ptr(png_ptr); 
+    check=(png_size_t) file->read((void*)data,length); 
+    // } 
+ 
diff --git a/bolzplatz2006.spec b/bolzplatz2006.spec
index 8fa9cfb..3522988 100644
--- a/bolzplatz2006.spec
+++ b/bolzplatz2006.spec
@@ -7,7 +7,7 @@
 
 Name:           bolzplatz2006
 Version:        1.0.3
-Release:        14%{?dist}
+Release:        15%{?dist}
 Summary:        Slam Soccer 2006 is a funny football game in 3D-comic-style
 Summary(fr):    Coup de Foot 2006 est un jeu comique en 3D
 Summary(de):    Bolzplatz 2006 ist ein spaßiges Fußballspiel im 3D-Comic-Stil
@@ -33,7 +33,7 @@ Patch5:         %{name}-lwjgl-openal11.patch
 Patch6:         %{name}-lwjgl-Makefile.patch
 Patch7:         %{name}-no-xrandr.patch
 Patch8:         %{name}-versioned-openal.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch9:         %{name}-1.0.3-libpng15.patch
 BuildRequires:  ant-nodeps sdljava dom4j vecmath1.2 swig xml-commons-apis
 BuildRequires:  libGLU-devel DevIL-devel libXxf86vm-devel libjpeg-devel
 BuildRequires:  libpng-devel libXext-devel libXrandr-devel libXcursor-devel
@@ -125,6 +125,7 @@ popd
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 sed -i 's/\r//' license.txt
 # we use the system versions of these
 rm -r libsrc/irrlicht-0.14-patched/libpng libsrc/irrlicht-0.14-patched/zlib \
@@ -178,8 +179,6 @@ jar cf %{name}.jar -C classes .
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 # dirs
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}
@@ -214,25 +213,20 @@ install -p -m 644 %{SOURCE7} %{SOURCE8} %{SOURCE9} \
   $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 
 %files
-%defattr(-,root,root,-)
 %doc license.txt
 %{_bindir}/%{name}*
 %{_libdir}/%{name}
@@ -243,6 +237,9 @@ fi
 
 
 %changelog
+* Wed Dec 14 2011 Hans de Goede <hdegoede at redhat.com> - 1.0.3-15
+- Fix building with new libpng
+
 * Tue Dec 06 2011 Adam Jackson <ajax at redhat.com> - 1.0.3-14
 - Rebuild for new libpng