Accepting request 70710 from home:coolo:branches:openSUSE:Factory

- update to 2.0.5
 * Prepare modperl for the upcoming perl 5.14
 * Many other fixes over two years, see Changes

OBS-URL: https://build.opensuse.org/request/show/70710
OBS-URL: https://build.opensuse.org/package/show/Apache:Modules/apache2-mod_perl?expand=0&rev=25

apache2-mod_perl.spec

@@ -20,7 +20,7 @@
 Url:            http://perl.apache.org/
 
 Name:           apache2-mod_perl
-BuildRequires:  apache2-devel db-devel ed pcre-devel perl-BSD-Resource perl-Compress-Zlib perl-Tie-IxHash perl-libwww-perl sudo
+BuildRequires:  apache2-devel db-devel ed pcre-devel perl-BSD-Resource perl-Compress-Zlib perl-Tie-IxHash perl-libwww-perl sudo perl
 %if 0%{sles_version} == 9
 BuildRequires:  openldap2-devel
 %endif
@@ -42,11 +42,10 @@ Requires:       perl-URI perl-libwww-perl
 Obsoletes:      mod_perl_2
 Conflicts:      mod_perl
 AutoReqProv:    on
-Version:        2.0.4
-Release:        48
-Source0:        mod_perl-%{version}.tar.bz2
-Patch:          %{name}-%{version}-tests.diff
-Patch1:         apache2-mod_perl-2.0.4-xss.patch
+Version:        2.0.5
+Release:        1
+Source0:        http://perl.apache.org/dist/mod_perl-%{version}.tar.gz
+Patch:          %{name}-2.0.4-tests.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
@@ -108,8 +107,7 @@ software depending on apache2-mod_perl.
 %prep
 #%setup -q -n modperl-2.0 -a 1
 %setup -q -n mod_perl-%{version}
-%patch
-%patch1 -p3
+#%patch
 find -name ".svn" -type d | xargs rm -rfv
 
 %build
@@ -281,13 +279,6 @@ EOF
 
 %files devel
 %defattr(-,root,root)
-%dir %{apache_includedir}
-%dir %{apache_includedir}/modules
-%{apache_includedir}/modules/perl
-
-%clean
-if ! test -f /.buildenv; then
-	rm -rf $RPM_BUILD_ROOT
-fi
+%{apache_includedir}/*
 
 %changelog