8
0

Accepting request 162979 from home:dimstar:branches:Apache:Modules

Update to 2.0.7 svn http24 branch: fix build with apache 2.4 in Factory

OBS-URL: https://build.opensuse.org/request/show/162979
OBS-URL: https://build.opensuse.org/package/show/Apache:Modules/apache2-mod_perl?expand=0&rev=38
This commit is contained in:
Factory Maintainer
2013-04-07 12:24:28 +00:00
committed by Git OBS Bridge
parent b534bd6e03
commit 56fb98e55d
5 changed files with 26 additions and 29 deletions

View File

@@ -2,7 +2,7 @@
#
# spec file for package apache2-mod_perl
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -52,13 +52,11 @@ Requires: perl-libwww-perl
Url: http://perl.apache.org/
Obsoletes: mod_perl_2
Conflicts: mod_perl
Version: 2.0.6
Version: 2.0.7+svn1448242
Release: 0
Source0: http://perl.apache.org/dist/mod_perl-%{version}.tar.gz
Patch: %{name}-2.0.4-tests.diff
Patch1: lfs-perl-5.14.patch
# RT#77129
Patch2: patch-PL_uid.diff
#%define apache_test_version 1_99_15
# cvs -d :pserver:anoncvs@cvs.apache.org:/home/cvspublic up -r MODPERL_%{apache_test_version}
#Source1: Apache-Test-%{apache_test_version}.tar.bz2
@@ -119,11 +117,10 @@ software depending on apache2-mod_perl.
#%setup -q -n modperl-2.0 -a 1
%setup -q -n mod_perl-%{version}
%patch1 -p1
%patch2
find -name ".svn" -type d | xargs rm -rfv
%build
perl Makefile.PL INSTALLDIRS=vendor MP_APXS=`which %{apxs}` MP_CCOPTS="$(%{apxs} -q CFLAGS)"
perl Makefile.PL INSTALLDIRS=vendor MP_APXS=`which %{apxs}` MP_APR_CONFIG=/usr/bin/apr-1-config MP_CCOPTS="$(%{apxs} -q CFLAGS)"
ln -s Apache-mod_perl_guide-1.29/bin bin
make %{?_smp_mflags}
# XXX mod_include/SSI does not include files when they are not named .shtml
@@ -149,6 +146,10 @@ if test -e ModPerl-Registry/t/cgi-bin/r_inherited.pl; then chmod +x ModPerl-Regi
# enable more apache modules
# we can't simply use a2enmod, since we are not root.
cat >> t/conf/extra.conf.in <<-EOF
LoadModule access_compat_module /usr/%_lib/apache2-prefork/mod_access_compat.so
LoadModule authn_core_module /usr/%_lib/apache2-prefork/mod_authn_core.so
LoadModule authz_core_module /usr/%_lib/apache2-prefork/mod_authz_core.so
LoadModule unixd_module /usr/%_lib/apache2-prefork/mod_unixd.so
LoadModule deflate_module /usr/%_lib/apache2-prefork/mod_deflate.so
LoadModule proxy_module /usr/%_lib/apache2-prefork/mod_proxy.so
LoadModule proxy_http_module /usr/%_lib/apache2-prefork/mod_proxy_http.so
@@ -163,6 +164,7 @@ chmod 2770 t/htdocs/hooks
# | grep -v grep | awk '{print $2}' | xargs -r kill
# exit 1
#}
mkdir t/run
t/TEST -start-httpd -port select -startup_timeout 720
t/TEST -run-tests || true
#t/TEST -run-tests || {
@@ -264,6 +266,7 @@ EOF
%{__cp} -av docs/api/APR/*.pod $RPM_BUILD_ROOT/%{perl_vendorarch}/APR/
%{__cp} -av docs/api/Apache2/*.pod $RPM_BUILD_ROOT/%{perl_vendorarch}/Apache2/
%{__cp} -av docs/api/ModPerl/*.pod $RPM_BUILD_ROOT/%{perl_vendorarch}/ModPerl/
find "%{buildroot}" -type f -name '*.orig' -delete -print
%files
%defattr(-,root,root)
@@ -291,5 +294,6 @@ EOF
%files devel
%defattr(-,root,root)
%{apache_includedir}/*
%{perl_vendorarch}/MyTest/
%changelog