[openmsx] New upstream release 0.8.1 Fix building with libpng-1.5

[Hans de Goede]

commit 70fa6f7ac9311572a573af4756d351b6ed4b5f97
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Tue Dec 6 15:24:04 2011 +0100

    New upstream release 0.8.1
    Fix building with libpng-1.5

 openmsx-0.6.1-flavour.patch  |   32 --------------------------------
 openmsx-0.6.3-datadir.patch  |   11 -----------
 openmsx-0.8.1-libpng15.patch |   12 ++++++++++++
 openmsx.spec                 |   17 ++++++++---------
 sources                      |    1 -
 5 files changed, 20 insertions(+), 53 deletions(-)
---
diff --git a/openmsx-0.8.1-libpng15.patch b/openmsx-0.8.1-libpng15.patch
new file mode 100644
index 0000000..46d4eb4
--- /dev/null
+++ b/openmsx-0.8.1-libpng15.patch
@@ -0,0 +1,12 @@
+diff -up openmsx-0.8.1/src/video/PNG.cc~ openmsx-0.8.1/src/video/PNG.cc
+--- openmsx-0.8.1/src/video/PNG.cc~	2011-03-12 21:41:38.000000000 +0100
++++ openmsx-0.8.1/src/video/PNG.cc	2011-12-06 15:16:12.331323816 +0100
+@@ -167,7 +167,7 @@ SDLSurfacePtr load(const std::string& fi
+ 				"Attempted to create a surface with excessive height: "
+ 				<< height << ", max " << MAX_SIZE);
+ 		}
+-		int bpp = png.info->channels * 8;
++		int bpp = png_get_channels(png.ptr, png.info) * 8;
+ 		assert(bpp == 24 || bpp == 32);
+ 		Uint32 redMask, grnMask, bluMask, alpMask;
+ 		if (OPENMSX_BIGENDIAN) {
diff --git a/openmsx.spec b/openmsx.spec
index 76b140f..14477a4 100644
--- a/openmsx.spec
+++ b/openmsx.spec
@@ -1,13 +1,13 @@
 Name:           openmsx
-Version:        0.7.2
-Release:        5%{?dist}
+Version:        0.8.1
+Release:        1%{?dist}
 Summary:        An emulator for the MSX home computer system
 Group:          Applications/Emulators
 License:        GPL+
 URL:            http://openmsx.sourceforge.net
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Patch0:         openmsx-0.6.1-installbase.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch1:         openmsx-0.8.1-libpng15.patch
 BuildRequires:  desktop-file-utils
 BuildRequires:  docbook-utils
 BuildRequires:  glew-devel >= 1.3.2
@@ -28,6 +28,7 @@ all aspects of the MSX with 100% accuracy.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 # Verbose compilation
 sed -i 's/@$(COMPILE_ENV)/$(COMPILE_ENV)/' build/main.mk
@@ -88,7 +89,6 @@ docbook2man doc/openmsx.sgml -o ./
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make %{?_smp_mflags} OPENMSX_FLAVOUR=rpm INSTALL_SHARE_DIR=%{_datadir}/%{name}\
      INSTALL_DOC_DIR=%{_docdir}/%{name}-%{version} \
      DESTDIR=$RPM_BUILD_ROOT install
@@ -121,10 +121,6 @@ desktop-file-install --vendor fedora \
                      %{name}.desktop
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %post
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
@@ -139,7 +135,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %files
-%defattr(-,root,root,-)
 %doc %{_docdir}/%{name}-%{version}
 %{_bindir}/%{name}
 %{_datadir}/%{name}
@@ -151,6 +146,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Tue Dec 06 2011 Hans de Goede <hdegoede at redhat.com> - 0.8.1-1
+- New upstream release 0.8.1
+- Fix building with libpng-1.5
+
 * Tue Dec 06 2011 Adam Jackson <ajax at redhat.com> - 0.7.2-5
 - Rebuild for new libpng
 
diff --git a/sources b/sources
index 8fdb755..e69de29 100644
--- a/sources
+++ b/sources
@@ -1 +0,0 @@
-1f6338be7d3db6827ddb7b57daa8e37f  openmsx-0.7.2.tar.gz