Author: glen Date: Sun Feb 24 12:14:45 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- apply branch diff to build with perl 5.10
---- Files affected:
SPECS:
apache-mod_perl.spec (1.161 -> 1.162)
---- Diffs:
================================================================
Index: SPECS/apache-mod_perl.spec
diff -u SPECS/apache-mod_perl.spec:1.161 SPECS/apache-mod_perl.spec:1.162
--- SPECS/apache-mod_perl.spec:1.161 Sat Feb 23 22:48:36 2008
+++ SPECS/apache-mod_perl.spec Sun Feb 24 13:14:40 2008
@@ -31,8 +31,8 @@
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
@@ -41,12 +41,15 @@
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
@@ -237,8 +240,8 @@
%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
@@ -326,6 +329,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.162 2008-02-24 12:14:40 glen
+- apply branch diff to build with perl 5.10
+
Revision 1.161 2008-02-23 21:48:36 glen
- release 7
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/apache-mod_perl.spec?r1=1.161&r2=1.162&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
