From 4b1f75ed10bf9ff4f1679484adce3c55d9ec5401 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: May 18 2017 11:59:49 +0000 Subject: Fix building on Perl without '.' in @INC --- diff --git a/spamassassin-3.4.1-Fix-building-on-Perl-without-dot-in-INC.patch b/spamassassin-3.4.1-Fix-building-on-Perl-without-dot-in-INC.patch new file mode 100644 index 0000000..93461ec --- /dev/null +++ b/spamassassin-3.4.1-Fix-building-on-Perl-without-dot-in-INC.patch @@ -0,0 +1,12 @@ +diff -up Mail-SpamAssassin-3.4.1/spamc/configure.pl.orig Mail-SpamAssassin-3.4.1/spamc/configure.pl +--- Mail-SpamAssassin-3.4.1/spamc/configure.pl.orig 2017-05-18 13:53:34.340378346 +0200 ++++ Mail-SpamAssassin-3.4.1/spamc/configure.pl 2017-05-18 13:52:55.950537948 +0200 +@@ -66,7 +66,7 @@ print join(' ', $Config{'perlpath'}, "ve + # Do the same thing as for the preprocessor below. + package version_h; + my $Z = $0; +- local $0 = "version.h.pl"; ++ local $0 = "./version.h.pl"; + local @ARGV = (); + # Got to check for defined because the script returns shell error level! + unless (defined do $0) { diff --git a/spamassassin.spec b/spamassassin.spec index 1a0526e..c16f0e0 100644 --- a/spamassassin.spec +++ b/spamassassin.spec @@ -63,7 +63,7 @@ Summary: Spam filter for email which can be invoked from mail delivery agents Name: spamassassin Version: 3.4.1 #Release: 0.8.%{prerev}%{?dist} -Release: 12%{?dist} +Release: 13%{?dist} License: ASL 2.0 Group: Applications/Internet URL: http://spamassassin.apache.org/ @@ -99,6 +99,7 @@ Patch100: spamassassin-3.4.1-netdns.patch # Openssl 1.1.x support # https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7361 Patch101: CRYPTO_malloc.patch +Patch102: spamassassin-3.4.1-Fix-building-on-Perl-without-dot-in-INC.patch # end of patches Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -183,6 +184,7 @@ To filter spam for all users, add that line to /etc/procmailrc # Patches 100+ are SVN backports (DO NOT REUSE!) %patch100 -p1 %patch101 -p1 +%patch102 -p1 # end of patches echo "RHEL=%{rhel} FEDORA=%{fedora}" @@ -359,6 +361,9 @@ exit 0 %endif %changelog +* Thu May 18 2017 Jitka Plesnikova - 3.4.1-13 +- Fix building on Perl without '.' in @INC + * Sat Feb 11 2017 Fedora Release Engineering - 3.4.1-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild