From 1d261a2252d74a9b7b9539582cc1bec0a323ae5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad@redhat.com>
Date: Mon, 16 Sep 2013 11:45:32 +0200
Subject: [PATCH] Removed upstreamed perl-fix patch

---
 graphviz-2.30.1-perl-fix.patch | 12 ------------
 graphviz.spec                  |  4 +---
 2 files changed, 1 insertion(+), 15 deletions(-)
 delete 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
deleted file mode 100644
index 76ae331..0000000
--- a/graphviz-2.30.1-perl-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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 0c59841..4df1b16 100644
--- a/graphviz.spec
+++ b/graphviz.spec
@@ -60,8 +60,6 @@ Source0:		http://www.graphviz.org/pub/graphviz/ARCHIVE/%{name}-%{version}.tar.gz
 Patch1:			graphviz-2.32.0-testsuite-sigsegv-fix.patch
 # Testsuite now do diff check also in case of err output (#645703).
 Patch2:			graphviz-2.32.0-rtest-errout-fix.patch
-# Sent upstream, ticket #2322
-Patch3:		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
@@ -261,7 +259,6 @@ Various tcl packages (extensions) for the graphviz tools.
 %setup -q
 %patch1 -p1 -b .testsuite-sigsegv-fix
 %patch2 -p1 -b .rtest-errout-fix
-%patch3 -p1 -b .perl-fix
 
 # Attempt to fix rpmlint warnings about executable sources
 find -type f -regex '.*\.\(c\|h\)$' -exec chmod a-x {} ';'
@@ -541,6 +538,7 @@ rm -rf %{buildroot}
 * Mon Sep 16 2013 Jaroslav Škarvada <jskarvad@redhat.com> - 2.34.0-1
 - New version
   Resolves: rhbz#1005957
+- Dropped perl-fix patch (upstreamed)
 
 * Sat Sep 14 2013 Richard W.M. Jones <rjones@redhat.com> - 2.32.0-2
 - Rebuild for OCaml 4.01.0.