diff --git a/.cvsignore b/.cvsignore index 65ed0cb..8e35c70 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -mod_perl-1.99_16.tar.gz -mod_perl-1.99_17.tar.gz +mod_perl-2.0.0-RC5.tar.gz diff --git a/mod_perl.spec b/mod_perl.spec index 57d8d16..d75cbb3 100644 --- a/mod_perl.spec +++ b/mod_perl.spec @@ -1,23 +1,26 @@ %define contentdir /var/www -Summary: An embedded Perl interpreter for the Apache Web server. -Name: mod_perl -Version: 1.99_17 -Release: 2 -Group: System Environment/Daemons -Source: http://perl.apache.org/dist/mod_perl-%{version}.tar.gz -Source1: perl.conf -Source2: filter-requires.sh -Source3: reap-stale-servers.sh -Source4: testlock.sh -License: GPL -URL: http://perl.apache.org/ -BuildRoot: %{_tmppath}/%{name}-root -Requires: httpd >= 2.0.40, perl -BuildPrereq: httpd-devel >= 2.0.45-14, httpd, perl, gdbm-devel -BuildPrereq: apr-devel, apr-util-devel -Prereq: perl -Requires: httpd-mmn = %(cat %{_includedir}/httpd/.mmn || echo missing) +Name: mod_perl +Version: 2.0.0 +Release: 0.rc5.1 +Summary: An embedded Perl interpreter for the Apache Web server + +Group: System Environment/Daemons +License: GPL +URL: http://perl.apache.org/ +Source0: http://perl.apache.org/dist/mod_perl-2.0.0-RC5.tar.gz +Source1: perl.conf +Source2: filter-requires.sh +Source3: reap-stale-servers.sh +Source4: testlock.sh +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: perl >= 1:5.6.1 +BuildRequires: httpd-devel >= 2.0.45-14, httpd, gdbm-devel +BuildRequires: apr-devel, apr-util-devel +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: httpd >= 2.0.40 +Requires: httpd-mmn = %([ -a %{_includedir}/httpd/.mmn ] && cat %{_includedir}/httpd/.mmn || echo missing) %define __perl_requires %{SOURCE2} @@ -32,52 +35,49 @@ no external Perl interpreter has to be started. Install mod_perl if you're installing the Apache web server and you'd like for it to directly incorporate a Perl interpreter. + %package devel -Summary: Files needed for building XS modules that use mod_perl -Group: Development/Libraries -Requires: mod_perl = %{version}-%{release}, httpd-devel +Summary: Files needed for building XS modules that use mod_perl +Group: Development/Libraries +Requires: mod_perl = %{version}-%{release}, httpd-devel %description devel The mod_perl-devel package contains the files needed for building XS modules that use mod_perl. + %prep -%setup -q +%setup -q -n %{name}-%{version}-RC5 + %build -%{__perl} Makefile.PL /dev/null ';' + +# Fix permissions to avoid strip failures on non-root builds. +chmod -R u+w $RPM_BUILD_ROOT/* # Install the config file -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d -install -m 644 $RPM_SOURCE_DIR/perl.conf \ - $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/ +install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d +install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/ # Install its manual. #mkdir -p $RPM_BUILD_ROOT%{contentdir}/manual/mod/mod_perl @@ -88,34 +88,56 @@ install -m 644 $RPM_SOURCE_DIR/perl.conf \ #rm faq/pod2htm* #install -m644 faq/*.html $RPM_BUILD_ROOT%{contentdir}/manual/mod/mod_perl/ -# Remove the temporary files. -find $RPM_BUILD_ROOT%{_libdir}/perl?/vendor_perl/*/*/auto -name "*.bs" | xargs rm -rm -f $RPM_BUILD_ROOT%{_libdir}/perl?/vendor_perl/*/*/perllocal.pod -rm -f $RPM_BUILD_ROOT%{_libdir}/perl?/*/*/perllocal.pod + +%check || : +# Run the test suite. +# Need to make t/htdocs/perlio because it isn't expecting to be run as +# root and will fail tests that try and write files because the server +# will have changed it's uid. +%ifarch 1386 +mkdir t/htdocs/perlio +chmod 777 t/htdocs/perlio +$RPM_SOURCE_DIR/testlock.sh acquire +$RPM_SOURCE_DIR/reap-stale-servers.sh +make test +$RPM_SOURCE_DIR/testlock.sh release +%endif + %clean -[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT + %files -%defattr(-,root,root) -%doc Changes INSTALL LICENSE README docs +%defattr(-,root,root,-) +%doc Changes LICENSE README* STATUS SVN-MOVE docs/ #%{contentdir}/manual/mod/* %config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf %{_bindir}/* %{_libdir}/httpd/modules/mod_perl.so -%{_libdir}/perl?/vendor_perl/*/*/auto/* -%{_libdir}/perl?/vendor_perl/*/*/Apache -%{_libdir}/perl?/vendor_perl/*/*/Bundle/* -%{_libdir}/perl?/vendor_perl/*/*/APR -%{_libdir}/perl?/vendor_perl/*/*/ModPerl -%{_libdir}/perl?/vendor_perl/*/*/*.pm -%{_mandir}/*/*.3* +%{perl_vendorarch}/auto/* +%{perl_vendorarch}/Apache/ +%{perl_vendorarch}/Apache2/ +%{perl_vendorarch}/Bundle/ +%{perl_vendorarch}/APR/ +%{perl_vendorarch}/ModPerl/ +%{perl_vendorarch}/*.pm +%{_mandir}/man3/*.3* + %files devel -%defattr(-,root,root) +%defattr(-,root,root,-) %{_includedir}/httpd/* + %changelog +* Sat Apr 16 2005 Warren Togami - 2.0.0-0.rc5.1 +- 2.0.0-RC5 + +* Sun Apr 03 2005 Jose Pedro Oliveira - 2.0.0-0.rc4.1 +- Update to 2.0.0-RC4. +- Specfile cleanup. (#153236) + * Tue Jan 18 2005 Chip Turner 1.99_17-2 - rebuild for new perl diff --git a/sources b/sources index 0dbb4af..8139d75 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ffb9d5c825b93d91e6c3a8885f7d5296 mod_perl-1.99_17.tar.gz +a523a60b5a9758a88a0f1bdcd09eb425 mod_perl-2.0.0-RC5.tar.gz