From baa470ae4d5fab6ef2830dc561e26cfeb2233f59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0t=C4=9Bp=C3=A1n=20Kasal?= <kasal@fedoraproject.org>
Date: Tue, 24 Nov 2009 12:44:41 +0000
Subject: [PATCH] - back out perl-5.10.0-spamassassin.patch (#528572)

---
 perl-5.10.0-spamassassin.patch | 11 -----------
 perl.spec                      |  8 +++-----
 2 files changed, 3 insertions(+), 16 deletions(-)
 delete mode 100644 perl-5.10.0-spamassassin.patch

diff --git a/perl-5.10.0-spamassassin.patch b/perl-5.10.0-spamassassin.patch
deleted file mode 100644
index ca6ff87..0000000
--- a/perl-5.10.0-spamassassin.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up perl-5.10.0/lib/File/Basename.pm.spam perl-5.10.0/lib/File/Basename.pm
---- perl-5.10.0/lib/File/Basename.pm.spam	2009-07-27 08:45:18.000000000 +0200
-+++ perl-5.10.0/lib/File/Basename.pm	2009-07-28 09:01:54.757410886 +0200
-@@ -331,6 +331,7 @@ sub dirname {
- sub _strip_trailing_sep  {
-     my $type = $Fileparse_fstype;
- 
-+	local $1;
-     if ($type eq 'MacOS') {
-         $_[0] =~ s/([^:]):\z/$1/s;
-     }
diff --git a/perl.spec b/perl.spec
index 03b5b6a..1960201 100644
--- a/perl.spec
+++ b/perl.spec
@@ -193,9 +193,6 @@ Patch60:	perl-skip-prereq.patch
 # RT #60508
 Patch61:	perl-5.10.0-much-better-swap-logic.patch
 
-# https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6148
-Patch62:	perl-5.10.0-spamassassin.patch
-
 # Update some of the bundled modules
 # see http://fedoraproject.org/wiki/Perl/perl.spec for instructions
 Patch100:	perl-update-constant.patch
@@ -1008,7 +1005,6 @@ upstream tarball from perl.org.
 %patch59 -p1
 %patch60 -p1
 %patch61 -p1
-%patch62 -p1
 
 %patch100 -p1
 %patch101 -p1
@@ -1296,7 +1292,6 @@ perl -x patchlevel.h \
 	'Fedora Patch59: h2ph: generated *.ph files no longer produce warnings when processed' \
 	'Fedora Patch60: remove PREREQ_FATAL from Makefile.PLs processed by miniperl' \
 	'Fedora Patch61: much better swap logic to support reentrancy and fix assert failure' \
-	'Fedora Patch62: spam assassin needs workaround for removing tainted mode' \
 	'Fedora Patch100: Update module constant to %{constant_version}' \
 	'Fedora Patch101: Update Archive::Extract to %{Archive_Extract_version}' \
 	'Fedora Patch102: Update Archive::Tar to %{Archive_Tar_version}' \
@@ -1947,6 +1942,9 @@ TMPDIR="$PWD/tmp" make test
 
 # Old changelog entries are preserved in CVS.
 %changelog
+* Tue Nov 24 2009 Stepan Kasal <skasal@redhat.com> - 4:5.10.0-85
+- back out perl-5.10.0-spamassassin.patch (#528572)
+
 * Thu Oct 01 2009 Chris Weyl <cweyl@alumni.drew.edu> - 4:5.10.0-84
 - add /perl(UNIVERSAL)/d; /perl(DB)/d to perl_default_filter auto-provides
   filtering