- apply branch diff to build with perl 5.10

Changed files:
    apache-mod_perl.spec -> 1.162

diff --git a/apache-mod_perl.spec b/apache-mod_perl.spec
index 6c711b0a4e07bb832586c438dd3180bff3a5a53c..3dc6c5f6cd918289c34f5ca31dcd3ad2fed2ab7c 100644 (file)
--- a/apache-mod_perl.spec
+++ b/apache-mod_perl.spec
@@ -30,8 +30,8 @@ Summary(sv.UTF-8):    En inbyggd Perl-interpretator för webbservern Apache
 Summary(uk.UTF-8):     Модуль вбудовування інтерпретатора Perl в сервер Apache
 Summary(zh_CN.UTF-8):  用于 Apache web 服务程序的 Perl 解释程序。
 Name:          apache-mod_perl
-Version:       2.0.3
-Release:       7
+Version:       2.0.4
+Release:       0
 Epoch:         1
 License:       Apache
 Group:         Networking/Daemons
@@ -40,12 +40,15 @@ Source0:    http://perl.apache.org/dist/mod_perl-%{version}.tar.gz
 Source1:       %{name}.conf
 Patch0:                %{name}-Makefile_PL.patch
 Patch1:                %{name}-path_info_secfix.patch
+Patch2:                %{name}-magic.patch
+Patch100:      %{name}-branch.diff
 URL:           http://perl.apache.org/
 BuildRequires: apache-devel >= 2.0.55-1
 BuildRequires: apr-util-devel >= 1:1.0.0
 BuildRequires: expat-devel
 BuildRequires: gdbm-devel
 BuildRequires: openldap-devel >= 2.4.6
+BuildRequires: patchutils
 BuildRequires: perl-Apache-Test >= 1:%{apache_test_version}
 %{?with_autodeps:BuildRequires:        perl-Data-Flow}
 BuildRequires: perl-devel >= 1:5.8.2
@@ -236,8 +239,8 @@ Perlowe API dla mod_perla.
 
 %prep
 %setup -q -n mod_%{mod_name}-%{version}
+cat %{PATCH100} | filterdiff -x t/apr-ext/perlio.t -x t/response/TestPerl/ithreads_eval.pm -x t/response/TestPerl/ithreads.pm -x t/protocol/eliza.t | patch -p0
 %patch0 -p1
-%patch1 -p0
 
 bundled=$(%{__perl} -IApache-Test/lib -MApache::Test -e 'print Apache::Test->VERSION')
 if [ "%apache_test_version" != "$bundled" ]; then