commit apache2-mod_perl for openSUSE:Factory
Hello community, here is the log from the commit of package apache2-mod_perl for openSUSE:Factory checked in at Fri May 27 10:48:15 CEST 2011. -------- --- apache2-mod_perl/apache2-mod_perl.changes 2011-05-18 16:00:06.000000000 +0200 +++ /mounts/work_src_done/STABLE/apache2-mod_perl/apache2-mod_perl.changes 2011-05-26 17:22:14.000000000 +0200 @@ -1,0 +2,7 @@ +Thu May 26 15:19:55 UTC 2011 - coolo@novell.com + +- avoid a conflict between apache's LARGEFILE64_SOURCE and perl's + FILE_OFFSET_BITS=64 because the conflict isn't real and causes + the perl structures to be invalid if only the apache flags are used + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- nolfs.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apache2-mod_perl.spec ++++++ --- /var/tmp/diff_new_pack.puXvoT/_old 2011-05-27 10:45:44.000000000 +0200 +++ /var/tmp/diff_new_pack.puXvoT/_new 2011-05-27 10:45:44.000000000 +0200 @@ -43,9 +43,10 @@ Conflicts: mod_perl AutoReqProv: on Version: 2.0.5 -Release: 1 +Release: 3 Source0: http://perl.apache.org/dist/mod_perl-%{version}.tar.gz Patch: %{name}-2.0.4-tests.diff +Patch1: nolfs.patch #%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 @@ -107,6 +108,7 @@ %prep #%setup -q -n modperl-2.0 -a 1 %setup -q -n mod_perl-%{version} +%patch1 -p1 #%patch find -name ".svn" -type d | xargs rm -rfv ++++++ nolfs.patch ++++++ Index: mod_perl-2.0.5/lib/Apache2/Build.pm =================================================================== --- mod_perl-2.0.5.orig/lib/Apache2/Build.pm 2011-02-02 21:23:47.000000000 +0100 +++ mod_perl-2.0.5/lib/Apache2/Build.pm 2011-05-26 17:12:46.276946520 +0200 @@ -2147,7 +2147,8 @@ sub has_large_files_conflict { # with it is that we didn't have such a case yet, but may need to # deal with it later - return $perl_lfs64 ^ $apr_lfs64; + return 0; + # $perl_lfs64 ^ $apr_lfs64; } # if perl is built with uselargefiles, but apr not, the build won't ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de