- release 3

[packages/apr.git] / apr.spec

diff --git a/apr.spec b/apr.spec
index 374d2053917ba9b5573a853a07d3c2d9ec65e144..b32c3d3035ea3bf87fd5b5e699c46e247050b120 100644 (file)
--- a/apr.spec
+++ b/apr.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:       3
 Epoch:         1
 License:       Apache v2.0
 Group:         Libraries
@@ -12,7 +12,7 @@ Patch0:               %{name}-link.patch
 Patch1:                %{name}-metuxmpm.patch
 Patch2:                %{name}-libtool.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
@@ -111,7 +111,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 +129,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