- merged from APACHE2

Changed files:
    apache-mod_perl.conf -> 1.3
    apache-mod_perl.spec -> 1.34

diff --git a/apache-mod_perl.conf b/apache-mod_perl.conf
index 1d2570b0219282dd22c342e1088b165baa1db13d..42f8e8db71fc87f132b1b4611a6f6a309ab1f52d 100644 (file)
--- a/apache-mod_perl.conf
+++ b/apache-mod_perl.conf
@@ -1,4 +1,4 @@
-LoadModule perl_module          /usr/lib/apache/mod_perl.so
+LoadModule perl_module          /usr/lib/apache/perl_module.so
 
 <IfModule mod_perl.c>
 PerlModule Apache2 

diff --git a/apache-mod_perl.spec b/apache-mod_perl.spec
index c1b86b6095f868d8941da47d6dff4a3e5b8fc00a..3e4de1fb8185151c939713052f1ed1678a2d0777 100644 (file)
--- a/apache-mod_perl.spec
+++ b/apache-mod_perl.spec
@@ -1,7 +1,6 @@
-# TODO:
-# - add devel subpackage
 %include       /usr/lib/rpm/macros.perl
 %define        apxs    /usr/sbin/apxs
+%define                mver    1.99_08
 Summary:       A Perl interpreter for the Apache Web server
 Summary(cs):   Vestavìný interpret Perlu pro WWW server Apache
 Summary(da):   En indbygget Perl-fortolker for webtjeneren Apache
@@ -22,17 +21,16 @@ Summary(sv):        En inbyggd Perl-interpretator f
 Summary(uk):   íÏÄÕÌØ ×ÂÕÄÏ×Õ×ÁÎÎÑ ¦ÎÔÅÒÐÒÅÔÁÔÏÒÁ Perl × ÓÅÒ×ÅÒ Apache
 Summary(zh_CN):        ÓÃÓÚ Apache web ·þÎñ³ÌÐòµÄ Perl ½âÊͳÌÐò¡£
 Name:          apache-mod_perl
-Version:       1.27
-Release:       3
+Version:       2.0
+Release:       1.%{mver}
 License:       GPL
 Group:         Networking/Daemons
-URL:           http://perl.apache.org
-Source0:       http://perl.apache.org/dist/mod_perl-%{version}.tar.gz
-Patch0:                apache-perl-rh.patch
-# from ftp://ftp.kddlabs.co.jp/Linux/packages/Kondara/pub/Jirai/
-Patch1:                mod_perl-v6.patch
-BuildRequires: apache(EAPI)-devel
-BuildRequires: perl >= 5.8.0
+Source0:       http://perl.apache.org/dist/mod_perl-%{version}-current.tar.gz
+Source1:       %{name}.conf
+URL:           http://perl.apache.org/
+BuildRequires: apache-devel >= 2.0.0
+BuildRequires: gdbm-devel
+BuildRequires: perl >= 5.6.1
 BuildRequires: perl-B-Graph
 BuildRequires: perl-BSD-Resource
 BuildRequires: perl-Devel-Symdump
@@ -40,14 +38,20 @@ BuildRequires:      perl-HTML-Parser
 BuildRequires: perl-MIME-Base64
 BuildRequires: perl-URI
 BuildRequires: perl-libwww
-BuildRequires: rpm-perlprov >= 4.1-13
+BuildRequires: rpm-perlprov >= 3.0.3-16
 BuildRequires: %{apxs}
-PreReq:                apache(EAPI)
+PreReq:                apache >= 2.0.0
+%requires_eq   apache
 Requires(post,preun):  %{apxs}
 Provides:      perl(mod_perl_hooks)
 Provides:      mod_perl
 Obsoletes:     mod_perl
 Obsoletes:     mod_perl-common
+# bugs in rpm perl dependency finder?
+Provides:      perl(Apache::FunctionTable)
+Provides:      perl(Apache::StructureTable)
+Provides:      perl(Apache::TestConfigParse)
+Provides:      perl(Apache::TestConfigPerl)
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -181,39 +185,32 @@ Apache web 
 ½Å±¾»Øת¹ý³Ì¸üΪ¿ìËÙ¡£
 
 %prep
-%setup  -q -n mod_perl-%{version}
-%patch0 -p1
-%patch1 -p1
+%setup  -q -n mod_perl-%{mver}
 
 %build
 perl Makefile.PL \
-       USE_APXS=1 \
-       WITH_APXS=%{apxs} \
-       EVERYTHING=1 \
-       PERL_STACKED_HANDLERS=1 \
+       MP_APXS=%{apxs} \
+       MP_AP_PREFIX=%{_usr} \
        INSTALLDIRS=vendor
 
-(cd apaci; ln -s ../src/modules .; chmod +x find_source)
-%{__make}
-
-cd faq
-%{__make}
+%{__make} \
+       CC="%{__cc}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_libdir}/apache,/home/httpd/manual/mod}
+install -d $RPM_BUILD_ROOT{%{_libdir}/apache,/etc/httpd/httpd.conf}
+install -d $RPM_BUILD_ROOT/etc/httpd/httpd.conf/
 
-%{__make} pure_install DESTDIR=$RPM_BUILD_ROOT
+%{__make} install \
+       DESTDIR=$RPM_BUILD_ROOT \
+       MODPERL_AP_LIBEXECDIR=$RPM_BUILD_ROOT%{_libdir}/apache
 
-install apaci/libperl.so $RPM_BUILD_ROOT%{_libdir}/apache
-install htdocs/manual/mod/mod_perl.html \
-       $RPM_BUILD_ROOT/home/httpd/manual/mod
+install %{SOURCE1} $RPM_BUILD_ROOT/etc/httpd/httpd.conf/75_mod_perl.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%{apxs} -e -a -n perl %{_libexecdir}/libperl.so 1>&2
 if [ -f /var/lock/subsys/httpd ]; then
        /etc/rc.d/init.d/httpd restart 1>&2
 else
@@ -222,7 +219,6 @@ fi
 
 %preun
 if [ "$1" = "0" ]; then
-       %{apxs} -e -A -n perl %{_libexecdir}/libperl.so 1>&2
        if [ -f /var/lock/subsys/httpd ]; then
                /etc/rc.d/init.d/httpd restart 1>&2
        fi
@@ -231,27 +227,22 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc README INSTALL CREDITS faq/*.html faq/*.txt apache-modlist.html eg
-%doc /home/httpd/manual/mod/*html
-
+%doc Changes INSTALL README STATUS
 %attr(755,root,root) %{_libdir}/apache/*.so
+%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/httpd/httpd.conf/*.conf
 
 %{perl_vendorarch}/*.pm
-%{perl_vendorarch}/*.PL
-
-%dir %{perl_vendorarch}/Apache
-%{perl_vendorarch}/Apache/*.pm
-%{perl_vendorarch}/Apache/Constants
-%dir %{perl_vendorarch}/auto/Apache
-%dir %{perl_vendorarch}/auto/Apache/Leak
-%dir %{perl_vendorarch}/auto/Apache/Symbol
-
+%{perl_vendorarch}/APR
+%{perl_vendorarch}/Apache
+%{perl_vendorarch}/Apache2
+%{perl_vendorarch}/Bundle/*.pm
+%{perl_vendorarch}/ModPerl
+
+%dir %{perl_vendorarch}/auto/*
+%dir %{perl_vendorarch}/auto/*/*
+%{perl_vendorarch}/auto/*/*.bs
+%attr(755,root,root) %{perl_vendorarch}/auto/*/*.so
 %{perl_vendorarch}/auto/*/*/*.bs
 %attr(755,root,root) %{perl_vendorarch}/auto/*/*/*.so
 
-%{_mandir}/man3/[Acm]*
-
-# to -devel ?
-%{perl_vendorarch}/auto/Apache/typemap
-%{perl_vendorarch}/auto/Apache/mod_perl.exp
-%{perl_vendorarch}/auto/Apache/include
+%{_mandir}/man?/*