- fix ABI mismatch with perl causing mod_perl to segfault on ix86

[packages/apache-mod_perl.git] / apache-mod_perl.spec

diff --git a/apache-mod_perl.spec b/apache-mod_perl.spec
index 063ea8945ff892c0e9645727056e6b7570c88199..31d7c4cffc73db5c4f269c588fe4af11d33caa35 100644 (file)
--- a/apache-mod_perl.spec
+++ b/apache-mod_perl.spec
@@ -11,7 +11,7 @@
 
 %define                ver     2.0.7
 %define                snap    svn1448242
-%define                rel     4
+%define                rel     7.1
 Summary:       A Perl interpreter for the Apache Web server
 Summary(cs.UTF-8):     Vestavěný interpret Perlu pro WWW server Apache
 Summary(da.UTF-8):     En indbygget Perl-fortolker for webtjeneren Apache
@@ -44,6 +44,7 @@ Source0:      mod_perl-%{version}-%{snap}.tar.gz
 # Source0-md5: 8b62bbfe8b499bc87b6d3d28eb765a24
 Source1:       %{name}.conf
 Patch0:                %{name}-Makefile_PL.patch
+Patch1:                perl-5.18.patch
 URL:           http://perl.apache.org/
 BuildRequires: apache-devel >= 2.0.55-1
 BuildRequires: apr-util-devel >= 1:1.0.0
@@ -51,8 +52,7 @@ BuildRequires:        expat-devel
 BuildRequires: gdbm-devel
 BuildRequires: openldap-devel >= 2.4.6
 %{?with_autodeps:BuildRequires:        perl-Data-Flow}
-BuildRequires: perl-devel >= 1:5.8.2
-BuildConflicts:        perl-Module-CoreList
+BuildRequires: perl-devel >= 1:5.18.0
 BuildRequires: rpm-perlprov >= 3.0.3-16
 BuildRequires: rpmbuild(macros) >= 1.268
 %if %{with tests}
@@ -70,6 +70,7 @@ BuildConflicts:       apache-mod_perl < 1:2.0.2-9
 Requires:      apache(modules-api) = %apache_modules_api
 Requires:      perl-mod_%{mod_name} = %{epoch}:%{version}-%{release}
 Provides:      apache(mod_perl)
+Obsoletes:     perl-Apache-Reload
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # TODO: separate -devel with ExtUtils::Embed and friends?
@@ -238,7 +239,7 @@ Perlowe API dla mod_perla.
 %package -n perl-Apache-Test
 Summary:       Apache::Test - Test.pm wrapper with helpers for testing Apache
 Summary(pl.UTF-8):     Apache::Test - wrapper na Test.pm z funkcjami do testowania Apache
-Version:       1.36
+Version:       1.37
 Group:         Development/Languages/Perl
 Requires:      perl-mod_%{mod_name} = %{epoch}:%{ver}-%{release}
 Requires:      perl-dirs >= 2.0-5
@@ -254,6 +255,7 @@ pomocnicze do testowania serwera Apache.
 %prep
 %setup -q -n mod_%{mod_name}-%{ver}-%{snap}
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__perl} Makefile.PL \
@@ -263,8 +265,8 @@ pomocnicze do testowania serwera Apache.
        INSTALLDIRS=vendor
 
 %{__make} \
-       OPTIMIZE="%{rpmcflags}" \
-       MODPERL_OPTIMIZE="%{rpmcflags}" \
+       OPTIMIZE="%{rpmcflags} -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" \
+       MODPERL_OPTIMIZE="%{rpmcflags} -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" \
        CC="%{__cc}" \
        MP_APXS=%{apxs}