summaryrefslogtreecommitdiffstats
path: root/mod_perl.spec
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2012-08-02 09:47:41 +0200
committerRemi Collet <fedora@famillecollet.com>2012-08-02 09:47:41 +0200
commit54d95119613f5cafc4495372e7f60ed37dee0dd2 (patch)
tree24dbbd0e6ebed5708e3552896fbe6b754b65ecb0 /mod_perl.spec
parente6b1093387a7ff50c4b2efe6036eff9a3e7f7d6c (diff)
mod_perl: sync with rawhide
Diffstat (limited to 'mod_perl.spec')
-rw-r--r--mod_perl.spec31
1 files changed, 22 insertions, 9 deletions
diff --git a/mod_perl.spec b/mod_perl.spec
index e5b98a2..8c3d3a2 100644
--- a/mod_perl.spec
+++ b/mod_perl.spec
@@ -4,7 +4,7 @@
Name: mod_perl
Version: 2.0.7
-Release: 1%{?dist}
+Release: 7%{?dist}
Summary: An embedded Perl interpreter for the Apache HTTP Server
Group: System Environment/Daemons
@@ -32,14 +32,6 @@ Requires: perl(Linux::Pid)
%{?perl_default_filter}
-# RPM 4.8 style
-%filter_from_provides /perl(Apache2::Connection)$/d; /perl(Apache2::RequestRec)$/d; /perl(warnings)$/d; /perl(HTTP::Request::Common)$/d;
-
-%filter_from_requires /perl(Apache::Test.*)/d; /perl(Data::Flow)/d
-%filter_from_requires /perl(Apache2::FunctionTable)/d; /perl(Apache2::StructureTable)/d
-
-%filter_setup
-# RPM 4.9 style
%global __provides_exclude %{?__provides_exclude:%__provides_exclude|}perl\\(Apache2::Connection\\)$
%global __provides_exclude %__provides_exclude|perl\\(Apache2::RequestRec\\)$
%global __provides_exclude %__provides_exclude|perl\\(warnings\\)$
@@ -49,6 +41,9 @@ Requires: perl(Linux::Pid)
%global __requires_exclude %__requires_exclude|perl\\(Apache2::FunctionTable\\)
%global __requires_exclude %__requires_exclude|perl\\(Apache2::StructureTable\\)
+# Hide dependencies on broken provides
+%global __requires_exclude %__requires_exclude|^perl\\(Apache2::MPM\\)
+
%description
Mod_perl incorporates a Perl interpreter into the Apache web server,
so that the Apache web server can directly execute Perl code.
@@ -183,6 +178,24 @@ echo "%%exclude %{_mandir}/man3/Apache::Test*.3pm*" >> exclude.files
%{_mandir}/man3/Apache::Test*.3pm*
%changelog
+* Thu Aug 02 2012 Remi Collet <RPMS@FamilleCollet.com> - 2.0.7-7
+- sync with rawhide, backport for remi repo
+
+* Wed Jul 25 2012 Jan Kaluza <jkaluza@redhat.com> - 2.0.7-7
+- updated httpd-2.4 patch
+
+* Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.7-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Tue Jul 10 2012 Petr Pisar <ppisar@redhat.com> - 2.0.7-5
+- Hide dependencies on broken provides
+
+* Mon Jul 09 2012 Petr Pisar <ppisar@redhat.com> - 2.0.7-4
+- Perl 5.16 rebuild
+
+* Mon Jul 09 2012 Petr Pisar <ppisar@redhat.com> - 2.0.7-3
+- Rebuild to fix Apache2::MPM dependency on i686
+
* Fri Jun 29 2012 Remi Collet <RPMS@FamilleCollet.com> - 2.0.7-1
- sync with rawhide, update to 2.0.7, rebuild for remi repo