- added apache(EAPI) to Prereq,

- added apache(EAPI)-devel to BuildRequires,
- use more macros,
- remove pod documentations,
- few celanups.

Changed files:
    apache-mod_perl.spec -> 1.10

diff --git a/apache-mod_perl.spec b/apache-mod_perl.spec
index b912cf652208e197a0f4b48fd32312170c2f908b..c4bc3d7b71619a39b10d0ae565dabea9b600ad53 100644 (file)
--- a/apache-mod_perl.spec
+++ b/apache-mod_perl.spec
@@ -6,23 +6,24 @@ Version:      1.25
 Release:       4
 License:       GPL
 Group:         Networking/Daemons
+Group(de):     Netzwerkwesen/Server
 Group(pl):     Sieciowe/Serwery
 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: rpm-perlprov >= 3.0.3-16
-BuildRequires: perl >= 5.005_03-14
-BuildRequires: apache-devel
+BuildRequires: apache(EAPI)-devel
 BuildRequires: gdbm-devel
-BuildRequires: perl-libwww
-BuildRequires: perl-HTML-Parser
-BuildRequires: perl-MIME-Base64
-BuildRequires: perl-BSD-Resource
+BuildRequires: perl >= 5.6.1
 BuildRequires: perl-B-Graph
+BuildRequires: perl-BSD-Resource
 BuildRequires: perl-Devel-Symdump
+BuildRequires: perl-HTML-Parser
+BuildRequires: perl-MIME-Base64
 BuildRequires: perl-URI
-Requires:      apache
+BuildRequires: perl-libwww
+BuildRequires: rpm-perlprov >= 3.0.3-16
+Prereq:                apache(EAPI)
 Provides:      perl(mod_perl_hooks)
 Provides:      mod_perl
 Obsoletes:     mod_perl
@@ -50,7 +51,7 @@ przyspiesza procesy zwi
 %build
 perl Makefile.PL \
        USE_APXS=1 \
-       WITH_APXS=%{_sbindir}/apxs \
+       WITH_APXS=/usr/sbin/apxs \
        EVERYTHING=1 \
        PERL_STACKED_HANDLERS=1
 
@@ -65,36 +66,26 @@ install -d $RPM_BUILD_ROOT{%{_libdir}/apache,/home/httpd/manual/mod}
 
 %{__make} pure_install DESTDIR=$RPM_BUILD_ROOT
        
-install -m 755 apaci/libperl.so $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
 
-find $RPM_BUILD_ROOT -name \*.so -exec strip --strip-unneeded {} \;
-
-(
-       cd $RPM_BUILD_ROOT%{perl_sitearch}/auto/mod_perl/
-       mv .packlist .packlist.old
-       sed -e "s|$RPM_BUILD_ROOT||g" < .packlist.old > .packlist
-       rm -f .packlist.old
-)
-
-gzip -9nf $RPM_BUILD_ROOT%{_mandir}/man3/* \
-        README INSTALL ToDo
+gzip -9nf README INSTALL ToDo
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%{_sbindir}/apxs -e -a -n perl %{_libexecdir}/libperl.so 1>&2
+/usr/sbin/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
+       /etc/rc.d/init.d/httpd restart 1>&2
 else
        echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache http daemon."
 fi
 
 %preun
 if [ "$1" = "0" ]; then
-       %{_sbindir}/apxs -e -A -n perl %{_libexecdir}/libperl.so 1>&2
+       /usr/sbin/apxs -e -A -n perl %{_libexecdir}/libperl.so 1>&2
        if [ -f /var/lock/subsys/httpd ]; then
                /etc/rc.d/init.d/httpd stop 1>&2
        fi
@@ -103,13 +94,12 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc {README,INSTALL,ToDo}.gz faq/*.html apache-modlist.html eg
+%doc *.gz faq/*.html apache-modlist.html eg
 %doc /home/httpd/manual/mod/*html
 
 %attr(755,root,root) %{_libdir}/apache/*.so
 
 %{perl_sitearch}/*.pm
-%{perl_sitearch}/*.pod
 %{perl_sitearch}/*.PL
 
 %{perl_sitearch}/Apache/*.pm