From 61b123bfcc7bfcd467362d194efba5d47f06f712 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 5 Aug 2013 15:26:08 +0200 Subject: [PATCH] Fixed FTBFS related to perl config Resolves: rhbz#991915 --- graphviz-2.30.1-perl-fix.patch | 12 ++++++++++++ graphviz.spec | 9 ++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 graphviz-2.30.1-perl-fix.patch diff --git a/graphviz-2.30.1-perl-fix.patch b/graphviz-2.30.1-perl-fix.patch new file mode 100644 index 0000000..76ae331 --- /dev/null +++ b/graphviz-2.30.1-perl-fix.patch @@ -0,0 +1,12 @@ +diff -up graphviz-2.30.1/config/config_perl.pl.orig graphviz-2.30.1/config/config_perl.pl +--- graphviz-2.30.1/config/config_perl.pl.orig 2013-02-14 14:27:39.000000000 +0100 ++++ graphviz-2.30.1/config/config_perl.pl 2013-08-05 14:38:06.409121360 +0200 +@@ -14,7 +14,7 @@ if ($ARGV[0] eq "PERL_INSTALL_DIR") { + + my $d; + +- foreach $d qw(installvendorarch vendorarch installsitearch sitearch) { ++ foreach $d (qw(installvendorarch vendorarch installsitearch sitearch)) { + if (exists($Config{$d}) and defined($Config{$d}) and + ($Config{$d} ne '') ) { + print "$Config{$d}"; diff --git a/graphviz.spec b/graphviz.spec index d5875d7..c17b699 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -51,7 +51,7 @@ Name: graphviz Summary: Graph Visualization Tools Version: 2.30.1 -Release: 12%{?dist} +Release: 13%{?dist} Group: Applications/Multimedia License: EPL URL: http://www.graphviz.org/ @@ -75,6 +75,8 @@ Patch9: graphviz-2.30.1-lefty-help.patch Patch10: graphviz-2.30.1-prune-help.patch # Sent upstream, ticket #2307 Patch11: graphviz-2.30.1-man-fix.patch +# Sent upstream, ticket #2322 +Patch12: graphviz-2.30.1-perl-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: zlib-devel, libpng-devel, libjpeg-devel, expat-devel, freetype-devel >= 2 BuildRequires: ksh, bison, m4, flex, tk-devel, tcl-devel >= 8.3, swig @@ -282,6 +284,7 @@ Various tcl packages (extensions) for the graphviz tools. %patch9 -p1 -b .lefty-help %patch10 -p1 -b .prune-help %patch11 -p1 -b .man-fix +%patch12 -p1 -b .perl-fix # Attempt to fix rpmlint warnings about executable sources find -type f -regex '.*\.\(c\|h\)$' -exec chmod a-x {} ';' @@ -558,6 +561,10 @@ rm -rf %{buildroot} %changelog +* Mon Aug 5 2013 Jaroslav Škarvada - 2.30.1-13 +- Fixed FTBFS related to perl config + Resolves: rhbz#991915 + * Sat Aug 03 2013 Fedora Release Engineering - 2.30.1-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild