X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=apache-mod_perl.spec;h=e15eb79290715862ff7a8ec21db168fd9639f487;hb=fab9f9142763eca574aa5469d7f257b3b42721b9;hp=04fb67896f8a243f2077372ffa73fce68c28a08c;hpb=36630f21073608f510af7fad6c8fb7295e863076;p=packages%2Fapache-mod_perl.git

diff --git a/apache-mod_perl.spec b/apache-mod_perl.spec
index 04fb678..e15eb79 100644
--- a/apache-mod_perl.spec
+++ b/apache-mod_perl.spec
@@ -1,7 +1,11 @@
 # TODO:
 # - separate perl-things from apache libs and configs (needed for some buildings)
+# - separate devel things from runtime things (apache-mod_perl-2.0.2-2 marks perl-ExtUtils-MakeMaker-6.25_08-1 (cap perl(ExtUtils::Install)))
+%bcond_with	internal_test	# use internal Apache-Test
+#
 %include	/usr/lib/rpm/macros.perl
 %define	apxs	/usr/sbin/apxs
+%define	apache_test_version	1.27-2
 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,51 +26,41 @@ Summary(sv):	En inbyggd Perl-interpretator f
 Summary(uk):	íÏÄÕÌØ ×ÂÕÄÏ×Õ×ÁÎÎÑ ¦ÎÔÅÒÐÒÅÔÁÔÏÒÁ Perl × ÓÅÒ×ÅÒ Apache
 Summary(zh_CN):	ÓÃÓÚ Apache web ·þÎñ³ÌÐòµÄ Perl ½âÊͳÌÐò¡£
 Name:		apache-mod_perl
-Version:	2.0.0
-%define	_rc	RC4
-Release:	0.%{_rc}.1
+Version:	2.0.2
+Release:	5
 Epoch:		1
 License:	Apache
 Group:		Networking/Daemons
-Source0:	http://perl.apache.org/dist/mod_perl-%{version}-%{_rc}.tar.gz
-# Source0-md5:	062af5ab71cfd0868b4e5a3b95aabf25
+Source0:	http://perl.apache.org/dist/mod_perl-%{version}.tar.gz
+# Source0-md5:	ad0a509fd34e3b8452887d80a1d45dea
 Source1:	%{name}.conf
 Patch0:		%{name}-Makefile_PL.patch
 URL:		http://perl.apache.org/
-BuildRequires:	apache-devel >= 2.0.0
+BuildRequires:	apache-devel >= 2.0.55-1
 BuildRequires:	apr-util-devel >= 1:1.0.0
 BuildRequires:	expat-devel
 BuildRequires:	gdbm-devel
-BuildRequires:	openldap-devel
+BuildRequires:	openldap-devel >= 2.3.0
+%{!?internal_test:BuildRequires:	perl-Apache-Test = %{apache_test_version}}
 BuildRequires:	perl-devel >= 1:5.8.2
-# These modules aren't needed?
-#BuildRequires:	perl-B-Graph
-#BuildRequires:	perl-BSD-Resource
-#BuildRequires:	perl-Devel-Symdump
-#BuildRequires:	perl-HTML-Parser
-#BuildRequires:	perl-MIME-Base64
-#BuildRequires:	perl-URI
-#BuildRequires:	perl-devel >= 5.6.1
-#BuildRequires:	perl-libwww
 BuildRequires:	rpm-perlprov >= 3.0.3-16
-%requires_eq	apache
+%requires_eq_to	apache apache-devel
+Requires:	apache(modules-api) = %apache_modules_api
 Requires:	perl(DynaLoader) = %(%{__perl} -MDynaLoader -e 'print DynaLoader->VERSION')
-Requires(post,preun):	%{apxs}
-# What's this for?
+Provides:	apache(mod_perl)
+# What's this mod_perl_hooks for?
 Provides:	perl(mod_perl_hooks)
-Provides:	mod_perl
-Provides:	perl-Apache-Test
-# bugs in rpm perl dependency finder?
-Provides:	perl(Apache::FunctionTable)
-Provides:	perl(Apache::StructureTable)
-BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+# not sure is this neccessary
+%{!?internal_test:Requires:	perl-Apache-Test = %{apache_test_version}}
 Obsoletes:	mod_perl
 Obsoletes:	mod_perl-common
+Conflicts:	perl-modules < 1:5.8.6-6
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # TODO: separate -devel with ExtUtils::Embed and friends?
-%define		_noautoreq	'perl(Apache::.*)' 'perl(mod_perl)' 'perl(ModPerl::.*)' 'perl(ExtUtils::Embed)'
-%define		_sysconfdir	%(%{apxs} -q SYSCONFDIR)
-%define		_pkglibdir	%(%{apxs} -q LIBEXECDIR)
+%define		_noautoreq	'perl(Apache::.*)' 'perl(mod_perl)' 'perl(ModPerl::.*)' 'perl(ExtUtils::Embed)' 'perl(Module::Build)'
+%define		_sysconfdir	%(%{apxs} -q SYSCONFDIR 2>/dev/null)
+%define		_pkglibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
 
 %description
 Mod_perl incorporates a Perl interpreter into the Apache web server,
@@ -198,16 +192,36 @@ Apache web 
 ½Ó¿Ú¡£ ÓÉÓÚ²»±ØÆô¶¯ÈκÎÍⲿ Perl ½âÊͳÌÐò£¬Òò´Ë»áʹ CGI
 ½Å±¾»Øת¹ý³Ì¸üΪ¿ìËÙ¡£
 
+%package devel
+Summary:	Files needed for building XS modules that use mod_perl
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
+Requires:	apache-devel >= 2.0
+
+%description devel
+The apache-mod_perl-devel package contains the files needed for
+building XS modules that use mod_perl.
+
 %prep
-%setup -q -n mod_perl-%{version}-%{_rc}
-%patch0 -p1 -b .orig
+%setup -q -n mod_perl-%{version}
+%patch0 -p1
+
+if %{without internal_test}
+system=$(%{__perl} -MApache::Test -e 'print Apache::Test->VERSION')
+bundled=$(%{__perl} -IApache-Test/lib -MApache::Test -e 'print Apache::Test->VERSION')
+if [ "$system" != "$bundled" ]; then
+	: Need Apache::Test version $bundled installed in system. please fix.
+	exit 1
+fi
+rm -rf Apache-Test
+%endif
 
 %build
 %{__perl} Makefile.PL \
 	MP_APXS=%{apxs} \
 	MP_APR_CONFIG=%{_bindir}/apr-1-config \
-	INSTALLDIRS=vendor \
-	MP_CCOPTS="-I/usr/include/apache `apu-1-config --includes`" 
+	MP_APU_CONFIG=%{_bindir}/apu-1-config \
+	INSTALLDIRS=vendor
 
 %{__make} \
 	OPTIMIZE="%{rpmcflags}" \
@@ -222,6 +236,13 @@ install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd.conf}
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -name \*.orig -exec rm -f '{}' \;
+
+install xs/tables/current/Apache2/* $RPM_BUILD_ROOT%{perl_vendorarch}/Apache2
+install xs/tables/current/APR/* $RPM_BUILD_ROOT%{perl_vendorarch}/APR
+install xs/tables/current/ModPerl/* $RPM_BUILD_ROOT%{perl_vendorarch}/ModPerl
+
+rm -rf $RPM_BUILD_ROOT%{perl_vendorarch}/Bundle
+rm -f $RPM_BUILD_ROOT%{_mandir}/man?/Bundle*
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/75_mod_perl.conf
 
 %clean
@@ -230,8 +251,6 @@ rm -rf $RPM_BUILD_ROOT
 %post
 if [ -f /var/lock/subsys/httpd ]; then
 	/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
@@ -241,30 +260,31 @@ if [ "$1" = "0" ]; then
 	fi
 fi
 
-
 %files
 %defattr(644,root,root,755)
 %doc Changes INSTALL README STATUS
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*.conf
 %attr(755,root,root) %{_pkglibdir}/*.so
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*.conf
 
 %{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
-# to -devel? directory ownership problem...
-%{_includedir}/apache/*.h
+%{perl_vendorarch}/auto/Apache2/typemap
 
-%{_mandir}/man?/[!B]*
+%{_mandir}/man?/*
+
+%files devel
+%defattr(644,root,root,755)
+%{_includedir}/apache/*.h