>From e20e46f078cc0065bca905ce6eeb7ded0d2b726e Mon Sep 17 00:00:00 2001
From: Robert Scheck <rob...@fedoraproject.org>
Date: Mon, 11 Jan 2016 04:06:43 +0100
Subject: Correct installation place of man pages (#1297257)

---
 perl-Razor-Agent-2.85-mandir.patch | 14 ++++++++++++++
 perl-Razor-Agent.spec              | 13 ++++++++++---
 2 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 perl-Razor-Agent-2.85-mandir.patch

diff --git a/perl-Razor-Agent-2.85-mandir.patch 
b/perl-Razor-Agent-2.85-mandir.patch
new file mode 100644
index 0000000..6b8e139
--- /dev/null
+++ b/perl-Razor-Agent-2.85-mandir.patch
@@ -0,0 +1,14 @@
+Patch by Gregor Herrmann <gre...@debian.org> for razor-agents <= 2.85 which 
adjusts
+the regular expression for perl 5.22. See also Debian bug report #807478.
+
+--- razor-agents-2.85/Makefile.PL              2007-05-09 00:47:53.000000000 
+0200
++++ razor-agents-2.85/Makefile.PL.mandir       2016-01-11 03:57:13.000000000 
+0100
+@@ -142,7 +142,7 @@
+   my $man5 = q{ \\
+               $(INST_MAN5DIR) $(INSTALLMAN5DIR)};
+ 
+-  $inherited =~ s/(\$\((?:DEST)?INSTALL\w*MAN1DIR\))/$1$man5/gm;
++  $inherited =~ s/(\$\((?:DEST)?INSTALL\w*MAN1DIR\)"?)/$1$man5/gm;
+ 
+   return $inherited;
+ }
diff --git a/perl-Razor-Agent.spec b/perl-Razor-Agent.spec
index 22f5213..0d127fc 100644
--- a/perl-Razor-Agent.spec
+++ b/perl-Razor-Agent.spec
@@ -4,12 +4,13 @@
 Summary:       Use a Razor catalogue server to filter spam messages
 Name:          perl-Razor-Agent
 Version:       2.85
-Release:       20%{?dist}
+Release:       21%{?dist}
 License:       Artistic 2.0
 Group:         Applications/Internet
 URL:           http://razor.sourceforge.net/
 Source:                
http://dl.sourceforge.net/razor/razor-agents-%{version}.tar.bz2
-Patch0:         razor-agents-2.85-use-sha-not-sha1.patch
+Patch0:                razor-agents-2.85-use-sha-not-sha1.patch
+Patch1:                perl-Razor-Agent-2.85-mandir.patch
 Requires:      perl(Net::DNS), perl(:MODULE_COMPAT_%(eval "`%{__perl} 
-V:version`"; echo $version))
 BuildRequires: perl(Net::DNS), perl(Digest::SHA1), perl(Time::HiRes), 
perl(URI), perl(ExtUtils::MakeMaker)
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -33,6 +34,7 @@ Agents on the network.
 %prep
 %setup -q -n razor-agents-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
@@ -67,7 +69,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc BUGS Changes CREDITS FAQ LICENSE README SERVICE_POLICY
+%{!?_licensedir:%global license %%doc}
+%license LICENSE
+%doc BUGS Changes CREDITS FAQ README SERVICE_POLICY
 %{_bindir}/*
 %{perl_vendorlib}/Razor2
 %{perl_vendorlib}/auto/Razor2
@@ -76,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man*/*
 
 %changelog
+* Mon Jan 11 2016 Robert Scheck <rob...@fedoraproject.org> 2.85-21
+- Correct installation place of man pages (#1297257)
+
 * Thu Jun 18 2015 Fedora Release Engineering <rel-...@lists.fedoraproject.org> 
- 2.85-20
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
-- 
cgit v0.11.2


        
http://pkgs.fedoraproject.org/cgit/perl-Razor-Agent.git/commit/?h=master&id=e20e46f078cc0065bca905ce6eeb7ded0d2b726e
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@lists.fedoraproject.org
http://lists.fedoraproject.org/admin/lists/perl-devel@lists.fedoraproject.org

Reply via email to