[mod_perl] fudge the LFS test (#730832)
jorton
jorton at fedoraproject.org
Wed Nov 9 22:53:30 UTC 2011
commit 4b9b3be64f8a5cfab795f400f9a3caada1218e1a
Author: Joe Orton <jorton at redhat.com>
Date: Wed Nov 9 14:53:26 2011 -0800
fudge the LFS test (#730832)
mod_perl-2.0.5-nolfs.patch | 14 ++++++++++++++
mod_perl.spec | 8 ++++++--
2 files changed, 20 insertions(+), 2 deletions(-)
---
diff --git a/mod_perl-2.0.5-nolfs.patch b/mod_perl-2.0.5-nolfs.patch
new file mode 100644
index 0000000..3eb345b
--- /dev/null
+++ b/mod_perl-2.0.5-nolfs.patch
@@ -0,0 +1,14 @@
+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
diff --git a/mod_perl.spec b/mod_perl.spec
index d74ff45..5e4126d 100644
--- a/mod_perl.spec
+++ b/mod_perl.spec
@@ -2,7 +2,7 @@
Name: mod_perl
Version: 2.0.5
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: An embedded Perl interpreter for the Apache HTTP Server
Group: System Environment/Daemons
@@ -12,6 +12,7 @@ Source0: http://perl.apache.org/dist/mod_perl-%{version}.tar.gz
Source1: perl.conf
Patch0: mod_perl-2.0.4-multilib.patch
Patch1: mod_perl-2.0.4-inline.patch
+Patch2: mod_perl-2.0.5-nolfs.patch
BuildRequires: perl-devel, perl(ExtUtils::Embed)
BuildRequires: httpd-devel >= 2.2.0, httpd, gdbm-devel
@@ -64,7 +65,7 @@ modules that use mod_perl.
%setup -q -n %{name}-%{version}
%patch0 -p1
%patch1 -p1 -b .inline
-
+%patch2 -p1
%build
@@ -149,6 +150,9 @@ done | tee devel.files | sed 's/^/%%exclude /' > exclude.files
%{_includedir}/httpd/*
%changelog
+* Wed Nov 9 2011 Joe Orton <jorton at redhat.com> - 2.0.5-6
+- fudge the LFS test (#730832)
+
* Fri Jul 22 2011 Petr Pisar <ppisar at redhat.com> - 2.0.5-5
- RPM 4.9 dependency filtering added
More information about the scm-commits
mailing list