- up to 1.2.11

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

diff --git a/apr-compat.spec b/apr-compat.spec
index 939effdd784f8cc4c1d10a60de268a6445cbe309..9bda213ab88d4284bb9dd3183661b4a8f158e31a 100644 (file)
--- a/apr-compat.spec
+++ b/apr-compat.spec
@@ -1,23 +1,33 @@
+#
+# Conditional build (Linux 2.4 compat, switch after Ac):
+%bcond_with    epoll           # use epoll() syscall (requires Linux 2.6)
+%bcond_with    sendfile64      # use sendfile64 on even if it requires Linux 2.6
+%bcond_with    tcpnodelaycork  # use TCP_NODELAY|TCP_CORK flags (requires Linux 2.6)
+#
+# Linux 2.4.32 supports sendfile64 only on i386 and mips (only 32-bit archs matter)
+%ifnarch ppc sparc sparc64
+%define                with_sendfile64         1
+%endif
 Summary:       Apache Portable Runtime
 Summary(pl):   Apache Portable Runtime - przeno¶na biblioteka uruchomieniowa
 Name:          apr
-Version:       1.2.1
+Version:       1.2.11
 Release:       1
 Epoch:         1
 License:       Apache v2.0
 Group:         Libraries
 Source0:       http://www.apache.org/dist/apr/%{name}-%{version}.tar.bz2
-# Source0-md5: db77e071bb693958aed82e8c5cbae445
+# Source0-md5: 22ede19520beb37dc17e62592b06a59c
 Patch0:                %{name}-link.patch
 Patch1:                %{name}-metuxmpm.patch
-# EPOLL PATCH: TO BE DROPPED AFTER AC
-Patch2:                %{name}-no-epoll.patch
+Patch2:                %{name}-libtool.patch
+Patch3:                %{name}-no-epoll.patch
 URL:           http://apr.apache.org/
 BuildRequires: autoconf >= 2.13
 BuildRequires: automake
 BuildRequires: libtool >= 1.3.3
 BuildRequires: libuuid-devel
-BuildRequires: perl-base
+BuildRequires: sed >= 4.0
 BuildRequires: python
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -51,6 +61,8 @@ Summary(pl):  Pliki nag
 Group:         Development/Libraries
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 Requires:      libuuid-devel
+Requires:      automake
+Requires:      libtool
 
 %description devel
 Header files and development documentation for apr.
@@ -75,22 +87,33 @@ Statyczna biblioteka apr.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%{!?with_epoll:%patch3 -p1}
+
+cat >> config.layout <<'EOF'
+<Layout PLD>
+sbindir:       %{_sbindir}
+libexecdir:    %{_libdir}/apr
+installbuilddir: ${datadir}/build-${APR_MAJOR_VERSION}
+localstatedir: /var/run
+runtimedir:    /var/run
+libsuffix:     -${APR_MAJOR_VERSION}
+</Layout PLD>
+EOF
 
 %build
 install /usr/share/automake/config.* build
 ./buildconf
-# 2.4/2.6 kernels on sparc32 do not support sendfile64
 %configure \
-%ifarch sparc
-       ac_cv_func_sendfile64=no \
-%endif
-       --with-devrandom=/dev/urandom \
-%ifarch %{ix86}
+       %{!?with_tcpnodelaycork:apr_cv_tcp_nodelay_with_cork=no} \
+       %{!?with_sendfile64:ac_cv_func_sendfile64=no} \
+       --enable-layout=PLD \
+%ifarch %{ix86} %{i8664}
 %ifnarch i386
        --enable-nonportable-atomics \
 %endif
 %endif
-       --enable-threads
+       --enable-threads \
+       --with-devrandom=/dev/urandom
 %{__make}
 
 %install
@@ -102,12 +125,17 @@ rm -rf $RPM_BUILD_ROOT
 ln -sf %{_bindir}/libtool $RPM_BUILD_ROOT%{_datadir}/libtool
 
 mv -f $RPM_BUILD_ROOT%{_datadir}/build-1 $RPM_BUILD_ROOT%{_datadir}/build
-install build/{*apr*.m4,*.awk,*.sh,config.*} $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/ltmain.sh $RPM_BUILD_ROOT%{_datadir}/build
+ln -snf /usr/bin/libtool $RPM_BUILD_ROOT%{_datadir}/build
 ln -sf build $RPM_BUILD_ROOT%{_datadir}/build-1
 
-%{__perl} -pi -e 's@^(APR_SOURCE_DIR=).*@$1"%{_datadir}"@' $RPM_BUILD_ROOT%{_bindir}/apr-config
-%{__perl} -pi -e 's@^(apr_builddir|apr_builders)=.*@$1=%{_datadir}/build-1@' \
+sed -i -e 's@^\(APR_SOURCE_DIR=\).*@\1"%{_datadir}"@' \
+       $RPM_BUILD_ROOT%{_bindir}/apr-1-config
+sed -i -e 's@^\(apr_builddir\|apr_builders\)=.*@\1=%{_datadir}/build-1@' \
        $RPM_BUILD_ROOT%{_datadir}/build/apr_rules.mk
+sed -i -e '1s@#!.*python@#!%{__python}@' $RPM_BUILD_ROOT%{_datadir}/build/gen-build.py
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -135,6 +163,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_datadir}/build/config.*
 %attr(755,root,root) %{_datadir}/build/*.sh
 %attr(755,root,root) %{_datadir}/build/libtool
+%attr(755,root,root) %{_datadir}/build/gen-build.py
 %{_datadir}/build-1
 %{_pkgconfigdir}/apr-1.pc