[mhonarc] Thanks to Jeff Schroeder for the ideas to fix the spec file (bz 664730) New upstream release Fixes C

[José Abílio Oliveira Matos]

commit 0ec65562c55168555616617b3668b71a1756a2bf
Author: José Matos <jamatos at fedoraproject.org>
Date:   Sat Mar 12 15:00:11 2011 +0000

    Thanks to Jeff Schroeder for the ideas to fix the spec file (bz 664730)
    New upstream release
    Fixes CVE-2010-1677 and CVE-2010-4524 (bz 664730)
    Use %{version} in Source
    Simplify the filter usage for perl requirements

 .gitignore   |    1 +
 mhonarc.spec |   28 +++++++++++++---------------
 sources      |    2 +-
 3 files changed, 15 insertions(+), 16 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 86b10de..4354f6d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 MHonArc-2.6.16.tar.bz2
+/MHonArc-2.6.18.tar.bz2
diff --git a/mhonarc.spec b/mhonarc.spec
index c1bd3d9..9ceeef6 100644
--- a/mhonarc.spec
+++ b/mhonarc.spec
@@ -1,17 +1,19 @@
 Name:           mhonarc
-Version:        2.6.16
-Release:        8%{?dist}
+Version:        2.6.18
+Release:        1%{?dist}
 Summary:        Perl mail-to-HTML converter
 
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://www.mhonarc.org/
-Source:         http://www.mhonarc.org/release/MHonArc/tar/MHonArc-2.6.16.tar.bz2
+Source:         http://www.mhonarc.org/release/MHonArc/tar/MHonArc-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 Provides:       MHonArc = %{version}-%{release}
+Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
+%{?perl_default_filter}
 
 %description
 MHonArc is a Perl mail-to-HTML converter. MHonArc provides HTML mail
@@ -23,17 +25,6 @@ customization features.
 %prep
 %setup -q -n MHonArc-%{version}
 
-# Filter out unwanted requires
-cat << EOF > %{name}-req
-#!/bin/sh
-%{__perl_requires} $* |\
-sed -e '/perl(.*\.pl)/d'
-EOF
-
-%global __perl_requires %{_builddir}/MHonArc-%{version}/%{name}-req
-chmod +x %{__perl_requires}
-
-
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__perl} install.me -batch -libpath $RPM_BUILD_ROOT%{_datadir}/MHonArc \
@@ -58,6 +49,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Mar 12 2011 José Matos <jamatos at fedoraproject.org> - 2.6.18-1
+- Thanks to Jeff Schroeder for the ideas to fix the spec file (bz 664730)
+- New upstream release
+- Fixes CVE-2010-1677 and CVE-2010-4524 (bz 664730)
+- Use %%{version} in Source
+- Simplify the filter usage for perl requirements
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6.16-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
@@ -98,7 +96,7 @@ rm -rf $RPM_BUILD_ROOT
 - version 2.6.14
 
 * Sat Jun 11 2005 Aurelien Bompard <gauret[AT]free.fr> 2.6.12-1
-- version 2.6.12 
+- version 2.6.12
 
 * Mon May 23 2005 Aurelien Bompard <gauret[AT]free.fr> 2.6.11-1%{?dist}
 - version 2.6.11
diff --git a/sources b/sources
index 8b0b2e4..ea93fad 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1aae948971869d6fdf3d810d9894b3db  MHonArc-2.6.16.tar.bz2
+c3eaec31467b3cc5bae751fb68080742  MHonArc-2.6.18.tar.bz2