804.032 bump
This commit is contained in:
parent
85c5767e45
commit
068f848f7f
1
.gitignore
vendored
1
.gitignore
vendored
@ -2,3 +2,4 @@ Tk-804.028_503.tar.gz
|
||||
/Tk-804.029_500.tar.gz
|
||||
/Tk-804.030.tar.gz
|
||||
/Tk-804.031.tar.gz
|
||||
/Tk-804.032.tar.gz
|
||||
|
@ -1,33 +0,0 @@
|
||||
From b486af844498013073000808890fb19917f00823 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
|
||||
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@redhat.com>
|
||||
---
|
||||
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
|
||||
|
13
perl-Tk.spec
13
perl-Tk.spec
@ -3,8 +3,8 @@
|
||||
|
||||
Name: perl-Tk
|
||||
# devel version fix for perl 5.14:
|
||||
Version: 804.031
|
||||
Release: 6%{?dist}
|
||||
Version: 804.032
|
||||
Release: 1%{?dist}
|
||||
Summary: Perl Graphical User Interface ToolKit
|
||||
|
||||
Group: Development/Libraries
|
||||
@ -16,8 +16,6 @@ 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
|
||||
# Fix freetype detection with 2.5
|
||||
Patch4: perl-Tk-freetype25.patch
|
||||
|
||||
@ -80,8 +78,6 @@ 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
|
||||
# freetype-2.5 detection
|
||||
%patch4 -p1
|
||||
|
||||
@ -130,6 +126,9 @@ find __demos/ -type f -exec chmod -x {} \;
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Jul 31 2014 Jitka Plesnikova <jplesnik@redhat.com> - 804.032-1
|
||||
- 804.032 bump
|
||||
|
||||
* Fri Jun 20 2014 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
|
||||
- 804.031-6
|
||||
- add patch from Yaakov Selkowitz to fix freetype detection (rhbz#1110872)
|
||||
@ -182,7 +181,7 @@ find __demos/ -type f -exec chmod -x {} \;
|
||||
* Thu Nov 10 2011 Iain Arnell <iarnell@gmail.com> 804.029-5
|
||||
- Rebuild for libpng 1.5
|
||||
|
||||
* Thu Oct 21 2011 Ralf Corsépius <corsepiu@fedoraproject.org> 804.029-4
|
||||
* Fri Oct 21 2011 Ralf Corsépius <corsepiu@fedoraproject.org> 804.029-4
|
||||
- Split out Tk/MMutil.pm, Tk/install.pm, Tk/MakeDepend.pm into perl-Tk-devel.
|
||||
(Avoid dependency on perl-devel - BZ 741777).
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user