- rel 6; make sure 2.6.23+ is used (for new *CLOEXEC api support)

[packages/apr-compat.git] / apr-compat.spec

diff --git a/apr-compat.spec b/apr-compat.spec
index 374d2053917ba9b5573a853a07d3c2d9ec65e144..a63d41f3902897b97236afca544e505f3f44fdb8 100644 (file)
--- a/apr-compat.spec
+++ b/apr-compat.spec
@@ -2,7 +2,7 @@ Summary:        Apache Portable Runtime
 Summary(pl.UTF-8):     Apache Portable Runtime - przenośna biblioteka uruchomieniowa
 Name:          apr
 Version:       1.3.3
-Release:       2
+Release:       6
 Epoch:         1
 License:       Apache v2.0
 Group:         Libraries
@@ -11,8 +11,9 @@ Source0:      http://www.apache.org/dist/apr/%{name}-%{version}.tar.bz2
 Patch0:                %{name}-link.patch
 Patch1:                %{name}-metuxmpm.patch
 Patch2:                %{name}-libtool.patch
+Patch3:                %{name}-bug-46425.patch
 URL:           http://apr.apache.org/
-BuildRequires: autoconf >= 2.13
+BuildRequires: autoconf >= 2.50
 BuildRequires: automake
 %if "%{pld_release}" != "ac"
 BuildRequires: libtool >= 2:2.2
@@ -25,8 +26,8 @@ BuildRequires:        rpm >= 4.4.9-56
 BuildRequires: rpm-pythonprov
 BuildRequires: sed >= 4.0
 %if "%{pld_release}" != "ac"
-BuildRequires: uname(release) >= 2.6
-Requires:      uname(release) >= 2.6
+BuildRequires: uname(release) >= 2.6.23
+Requires:      uname(release) >= 2.6.23
 %endif
 Conflicts:     kernel24
 Conflicts:     kernel24-smp
@@ -93,6 +94,7 @@ Statyczna biblioteka apr.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p0
 
 cat >> config.layout <<'EOF'
 <Layout PLD>
@@ -111,7 +113,7 @@ install /usr/share/automake/config.* build
 
 %configure \
        --enable-layout=PLD \
-%ifarch %{ix86} %{i8664}
+%ifarch %{ix86} %{x8664}
 %ifnarch i386
        --enable-nonportable-atomics \
 %endif
@@ -129,7 +131,11 @@ rm -rf $RPM_BUILD_ROOT
 mv -f $RPM_BUILD_ROOT%{_datadir}/build-1 $RPM_BUILD_ROOT%{_datadir}/build
 install build/{*apr*.m4,*.awk,*.sh,gen-build.py} $RPM_BUILD_ROOT%{_datadir}/build
 ln -snf /usr/share/automake/config.{guess,sub} $RPM_BUILD_ROOT%{_datadir}/build
-ln -snf /usr/share/libtool/config/ltmain.sh $RPM_BUILD_ROOT%{_datadir}/build
+if [ -f /usr/share/libtool/config/ltmain.sh ]; then
+       ln -snf /usr/share/libtool/config/ltmain.sh $RPM_BUILD_ROOT%{_datadir}/build
+else
+       ln -snf /usr/share/libtool/ltmain.sh $RPM_BUILD_ROOT%{_datadir}/build
+fi
 ln -snf /usr/bin/libtool $RPM_BUILD_ROOT%{_datadir}/build
 ln -sf build $RPM_BUILD_ROOT%{_datadir}/build-1