From d37032f38a00983eec0e9e9d9ac31bfbfb23e495 Mon Sep 17 00:00:00 2001 From: radzio Date: Thu, 26 May 2005 11:55:54 +0000 Subject: [PATCH] update to 2.0.0 final Changed files: apache-mod_perl-Makefile_PL.patch -> 1.9 apache-mod_perl.spec -> 1.89 --- apache-mod_perl-Makefile_PL.patch | 10 +++++----- apache-mod_perl.spec | 15 ++++++++------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/apache-mod_perl-Makefile_PL.patch b/apache-mod_perl-Makefile_PL.patch index 308ab9b..970b4e7 100644 --- a/apache-mod_perl-Makefile_PL.patch +++ b/apache-mod_perl-Makefile_PL.patch @@ -1,12 +1,12 @@ -diff -urN mod_perl-2.0.0-RC6_org/Makefile.PL mod_perl-2.0.0-RC6/Makefile.PL ---- mod_perl-2.0.0-RC6_org/Makefile.PL 2004-09-26 09:10:55.000000000 +0200 -+++ mod_perl-2.0.0-RC6/Makefile.PL 2005-05-18 17:37:29.142918144 +0100 +diff -Naur mod_perl-2.0.0-RC6.orig/Makefile.PL mod_perl-2.0.0-RC6/Makefile.PL +--- mod_perl-2.0.0-RC6.orig/Makefile.PL 2005-05-26 13:01:39.000000000 +0200 ++++ mod_perl-2.0.0-RC6/Makefile.PL 2005-05-26 13:01:48.000000000 +0200 @@ -71,7 +71,7 @@ DISTNAME => 'mod_perl', NO_META => 1, - ABSTRACT_FROM => 'lib/mod_perl.pm', + ABSTRACT_FROM => 'lib/mod_perl2.pm', - EXE_FILES => \@exe_files, +# EXE_FILES => \@exe_files, DEFINE => get_DEFINE(), macro => { - MODPERL_SRC => $code->path, + MODPERL_SRC => $code->path, diff --git a/apache-mod_perl.spec b/apache-mod_perl.spec index 77be3ed..191c44f 100644 --- a/apache-mod_perl.spec +++ b/apache-mod_perl.spec @@ -23,13 +23,13 @@ Summary(uk): Summary(zh_CN): ÓÃÓÚ Apache web ·þÎñ³ÌÐòµÄ Perl ½âÊͳÌÐò¡£ Name: apache-mod_perl Version: 2.0.0 -%define _rc RC6 -Release: 0.%{_rc}.0.1 +#%define _rc RC6 +Release: 0.1 Epoch: 1 License: Apache Group: Networking/Daemons -Source0: http://perl.apache.org/dist/mod_perl-%{version}-%{_rc}.tar.gz -# Source0-md5: 3e7f7aefb19c772a998802990ced15c0 +Source0: http://perl.apache.org/dist/mod_perl-%{version}.tar.gz +# Source0-md5: 99325d82e2c42361123f6a242e57a593 Source1: %{name}.conf Patch0: %{name}-Makefile_PL.patch URL: http://perl.apache.org/ @@ -199,7 +199,7 @@ Apache web ½Å±¾»Øת¹ý³Ì¸üΪ¿ìËÙ¡£ %prep -%setup -q -n mod_perl-%{version}-%{_rc} +%setup -q -n mod_perl-%{version} %patch0 -p1 -b .orig %build @@ -251,19 +251,20 @@ fi %{perl_vendorarch}/*.pm %{perl_vendorarch}/APR %{perl_vendorarch}/Apache +%{perl_vendorarch}/Apache2 %{perl_vendorarch}/ModPerl %dir %{perl_vendorarch}/auto/* %{perl_vendorarch}/auto/*/*.bs %attr(755,root,root) %{perl_vendorarch}/auto/*/*.so %dir %{perl_vendorarch}/auto/APR/[B-U]* -%dir %{perl_vendorarch}/auto/Apache/[A-U]* +%dir %{perl_vendorarch}/auto/Apache2/[A-U]* %dir %{perl_vendorarch}/auto/ModPerl/* %{perl_vendorarch}/auto/*/*/*.ix %{perl_vendorarch}/auto/*/*/*.bs %attr(755,root,root) %{perl_vendorarch}/auto/*/*/*.so -%{perl_vendorarch}/auto/Apache/typemap +%{perl_vendorarch}/auto/Apache2/typemap # to -devel? directory ownership problem... %{_includedir}/apache/*.h -- 2.44.0