commit a4a8717b2ebddf6959cce90cbd3ee71463941521
Author: Petr Písař <ppisar@xxxxxxxxxx>
Date: Wed Jul 17 10:58:23 2013 +0200
804.031 bump
.gitignore | 1 +
Tk-804.031-Link-PNG-test-to-zlib.patch | 33 ++++++++++++++++++++++++++++++++
perl-Tk.spec | 11 ++++++++-
sources | 2 +-
4 files changed, 44 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 59a477d..ac1f7c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
Tk-804.028_503.tar.gz
/Tk-804.029_500.tar.gz
/Tk-804.030.tar.gz
+/Tk-804.031.tar.gz
diff --git a/Tk-804.031-Link-PNG-test-to-zlib.patch b/Tk-804.031-Link-PNG-test-to-zlib.patch
new file mode 100644
index 0000000..63e3a1b
--- /dev/null
+++ b/Tk-804.031-Link-PNG-test-to-zlib.patch
@@ -0,0 +1,33 @@
+From b486af844498013073000808890fb19917f00823 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@xxxxxxxxxx>
+Date: Wed, 17 Jul 2013 10:43:28 +0200
+Subject: [PATCH] Link PNG test to zlib
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+<https://rt.cpan.org/Public/Bug/Display.html?id=86988>.
+
+Signed-off-by: Petr Písař <ppisar@xxxxxxxxxx>
+---
+ PNG/Makefile.PL | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/PNG/Makefile.PL b/PNG/Makefile.PL
+index dfb40d4..fe6c222 100755
+--- a/PNG/Makefile.PL
++++ b/PNG/Makefile.PL
+@@ -25,8 +25,9 @@ if ($? == 0) {
+ } else {
+ warn "'pkg-config libpng' failed, continue with fallback values for cflags and libs...\n";
+ $libpng_cflags = '-I/usr/local/include';
+- $libpng_libs = '-lpng -lz -lm';
++ $libpng_libs = '-lpng -lm';
+ }
++$libpng_libs .= ' -lz';
+
+ if ($Tk::MMtry::VERSION ge '4.007' &&
+ try_run("config/has_png.c",[$libpng_cflags],[$libpng_libs]))
+--
+1.8.1.4
+
diff --git a/perl-Tk.spec b/perl-Tk.spec
index 7d1b849..1300eda 100644
--- a/perl-Tk.spec
+++ b/perl-Tk.spec
@@ -3,8 +3,8 @@
Name: perl-Tk
# devel version fix for perl 5.14:
-Version: 804.030
-Release: 5%{?dist}
+Version: 804.031
+Release: 1%{?dist}
Summary: Perl Graphical User Interface ToolKit
Group: Development/Libraries
@@ -16,6 +16,8 @@ Patch0: perl-Tk-widget.patch
Patch1: perl-Tk-debian.patch.gz
# fix segfaults as in #235666 because of broken cashing code
Patch2: perl-Tk-seg.patch
+# Detect system libpng properly, CPAN RT#86988
+Patch3: Tk-804.031-Link-PNG-test-to-zlib.patch
# Versions before this have Unicode issues
BuildRequires: perl-devel >= 3:5.8.3
@@ -73,6 +75,8 @@ chmod -x pod/Popup.pod Tixish/lib/Tk/balArrow.xbm
%patch1 -p1
# patch to fix #235666 ... seems like caching code is broken
%patch2 -p1 -b .seg
+# CPAN RT #86988
+%patch3 -p1
%build
%{__perl} Makefile.PL INSTALLDIRS=vendor X11LIB=%{_libdir} XFT=1
@@ -119,6 +123,9 @@ find __demos/ -type f -exec chmod -x {} \;
%changelog
+* Wed Jul 17 2013 Petr Pisar <ppisar@xxxxxxxxxx> - 804.031-1
+- 804.031 bump
+
* Wed Jul 17 2013 Petr Pisar <ppisar@xxxxxxxxxx> - 804.030-5
- Perl 5.18 rebuild
diff --git a/sources b/sources
index fbfc856..0a503d5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-13275e85f99ee467a86d9598a437abff Tk-804.030.tar.gz
+57a8afd0563184c17a6470d1ee957f35 Tk-804.031.tar.gz
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/perl-devel
