[fuse-emulator] zlib fixes.
Jon Ciesla
limb at fedoraproject.org
Wed Aug 1 17:32:24 UTC 2012
commit 2a1b5b1a8b10e38001b402f691e127411132a5eb
Author: Jon Ciesla <limburgher at gmail.com>
Date: Wed Aug 1 12:32:15 2012 -0500
zlib fixes.
fuse-emulator-zlib.patch | 11 +++++++++++
fuse-emulator.spec | 7 ++++++-
2 files changed, 17 insertions(+), 1 deletions(-)
---
diff --git a/fuse-emulator-zlib.patch b/fuse-emulator-zlib.patch
new file mode 100644
index 0000000..655d89a
--- /dev/null
+++ b/fuse-emulator-zlib.patch
@@ -0,0 +1,11 @@
+diff -Naur fuse-1.0.0.1.orig/screenshot.c fuse-1.0.0.1/screenshot.c
+--- fuse-1.0.0.1.orig/screenshot.c 2011-01-12 16:36:28.000000000 -0500
++++ fuse-1.0.0.1/screenshot.c 2012-07-26 17:01:56.470317089 -0400
+@@ -49,6 +49,7 @@
+ #ifdef USE_LIBPNG
+
+ #include <png.h>
++#include <zlib.h>
+
+ static int get_rgb32_data( libspectrum_byte *rgb32_data, size_t stride,
+ size_t height, size_t width );
diff --git a/fuse-emulator.spec b/fuse-emulator.spec
index 5c790b9..f96f64a 100644
--- a/fuse-emulator.spec
+++ b/fuse-emulator.spec
@@ -1,6 +1,6 @@
Name: fuse-emulator
Version: 1.0.0.1
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: The Free UNIX Spectrum Emulator
Group: Applications/Emulators
License: GPLv2+
@@ -15,6 +15,7 @@ Source1: generate-tarball.sh
Source2: fuse.png
Source3: README.z88sdk
Source4: README_fuseroms.fedora
+Patch0: fuse-emulator-zlib.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: alsa-lib-devel
BuildRequires: bzip2-devel
@@ -39,6 +40,7 @@ Fuse is a spectrum emulator which emulates multiple models, including the 16K,
%prep
%setup -qn fuse-%{version}
+%patch0 -p1 -b .zlib
# Filter unwanted dependency in the debuginfo rpm
cat << \EOF > %{name}-req
@@ -81,6 +83,9 @@ rm -rf %{buildroot}
%changelog
+* Wed Aug 01 2012 Jon Ciesla <limburgher at gmail.com> - 1.0.0.1-5
+- Tom Lane's zlib fixes for libpng15, BZ 843645.
+
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.0.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
More information about the scm-commits
mailing list