[mod_perl] filter perl(HTTP::Request::Common) Provide from -devel (#247250)

[Jan Kaluža]

commit e18c20f9e3cdc3e062f75e8d54fdd4520d2f719f
Author: Jan Kaluza <hanzz.k at gmail.com>
Date:   Tue Mar 6 09:04:02 2012 +0100

    filter perl(HTTP::Request::Common) Provide from -devel (#247250)
    
    - use short_name as argv[0] (#782369)

 mod_perl-short-name.patch |   13 +++++++++++++
 mod_perl.spec             |   11 +++++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)
---
diff --git a/mod_perl-short-name.patch b/mod_perl-short-name.patch
new file mode 100644
index 0000000..9abef96
--- /dev/null
+++ b/mod_perl-short-name.patch
@@ -0,0 +1,13 @@
+diff --git a/src/modules/perl/modperl_config.c b/src/modules/perl/modperl_config.c
+index c4ef81f..4ec135c 100644
+--- a/src/modules/perl/modperl_config.c
++++ b/src/modules/perl/modperl_config.c
+@@ -186,7 +186,7 @@ modperl_config_srv_t *modperl_config_srv_new(apr_pool_t *p, server_rec *s)
+ 
+     /* make sure httpd's argv[0] is the first argument so $0 is
+      * correctly connected to the real thing */
+-    modperl_config_srv_argv_push(s->process->argv[0]);
++    modperl_config_srv_argv_push(s->process->short_name);
+ 
+     MP_TRACE_d(MP_FUNC, "new scfg: 0x%lx", (unsigned long)scfg);
+ 
diff --git a/mod_perl.spec b/mod_perl.spec
index 20c05ab..505c3c4 100644
--- a/mod_perl.spec
+++ b/mod_perl.spec
@@ -2,7 +2,7 @@
 
 Name:           mod_perl
 Version:        2.0.5
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        An embedded Perl interpreter for the Apache HTTP Server
 
 Group:          System Environment/Daemons
@@ -13,6 +13,7 @@ Source1:        perl.conf
 Patch0:         mod_perl-2.0.4-multilib.patch
 Patch1:         mod_perl-2.0.4-inline.patch
 Patch2:         mod_perl-2.0.5-nolfs.patch
+Patch3:         mod_perl-short-name.patch
 
 BuildRequires:  perl-devel, perl(ExtUtils::Embed)
 BuildRequires:  httpd-devel >= 2.2.0, httpd, gdbm-devel
@@ -25,7 +26,7 @@ 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;
+%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
@@ -35,6 +36,7 @@ Requires:       perl(Linux::Pid)
 %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\\)$
+%global __provides_exclude %__provides_exclude|perl\\(HTTP::Request::Common\\)$
 %global __requires_exclude %{?__requires_exclude:%__requires_exclude|}perl\\(Apache::Test.*\\)
 %global __requires_exclude %__requires_exclude|perl\\(Data::Flow\\)
 %global __requires_exclude %__requires_exclude|perl\\(Apache2::FunctionTable\\)
@@ -67,6 +69,7 @@ modules that use mod_perl.
 %patch0 -p1
 %patch1 -p1 -b .inline
 %patch2 -p1
+%patch3 -p1 -b .short-name
 
 %build
 
@@ -157,6 +160,10 @@ echo "%%exclude %{_mandir}/man3/Apache::Test*.3pm*" >> exclude.files
 %{_mandir}/man3/Apache::Test*.3pm*
 
 %changelog
+* Tue Mar 06 2012 Jan Kaluza <jkaluza at redhat.com> - 2.0.5-8
+- filter perl(HTTP::Request::Common) Provide from -devel (#247250)
+- use short_name as argv[0] (#782369)
+
 * Thu Jan  5 2012 Ville Skyttä <ville.skytta at iki.fi> - 2.0.5-7
 - Ship Apache::Reload and Apache::SizeLimit in main package (#748362).
 - Require Linux::Pid for Apache::SizeLimit (#766568).