- rel 4

[packages/apr.git] / apr.spec

diff --git a/apr.spec b/apr.spec
index bae4d2ba710836f0ee2da8874e73dea58a833667..73e3f9e26086df10a03eaa74600d991e69eb6137 100644 (file)
--- a/apr.spec
+++ b/apr.spec
@@ -1,22 +1,24 @@
 Summary:       Apache Portable Runtime
 Summary(pl):   Apache Portable Runtime - przeno¶na biblioteka uruchomieniowa
 Name:          apr
-Version:       0.9.5
-Release:       8
+Version:       1.1.1
+Release:       4
 Epoch:         1
 License:       Apache v2.0
 Group:         Libraries
-Source0:       http://www.apache.org/dist/apr/%{name}-0.9.4.tar.gz
-# Source0-md5: 0f1e6765532dd581a58d69b35adeecfe
-Patch0:                %{name}-0.9.4_0.9.5.patch.gz
-Patch1:                %{name}-link.patch
-Patch2:                %{name}-metuxmpm.patch
-Patch3:                %{name}-modes.patch
+Source0:       http://www.apache.org/dist/apr/%{name}-%{version}.tar.gz
+# Source0-md5: e153fda2df2338250548448c7a6e3d59
+Patch0:                %{name}-link.patch
+Patch1:                %{name}-metuxmpm.patch
+# EPOLL PATCH: TO BE DROPPED AFTER AC
+Patch2:                %{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: python
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _includedir     /usr/include/apr
@@ -48,6 +50,7 @@ Summary:      Header files and development documentation for apr
 Summary(pl):   Pliki nag³ówkowe i dokumentacja programisty do apr
 Group:         Development/Libraries
 Requires:      %{name} = %{epoch}:%{version}-%{release}
+Requires:      libuuid-devel
 
 %description devel
 Header files and development documentation for apr.
@@ -68,16 +71,25 @@ Static apr library.
 Statyczna biblioteka apr.
 
 %prep
-%setup -q -n %{name}-0.9.4
+%setup -q
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 %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}
+%ifnarch i386
+       --enable-nonportable-atomics \
+%endif
+%endif
        --enable-threads
 %{__make}
 
@@ -89,10 +101,12 @@ 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
+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@' \
+%{__perl} -pi -e 's@^(apr_builddir|apr_builders)=.*@$1=%{_datadir}/build-1@' \
        $RPM_BUILD_ROOT%{_datadir}/build/apr_rules.mk
 
 %clean
@@ -121,6 +135,8 @@ 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
+%{_datadir}/build-1
+%{_pkgconfigdir}/apr-1.pc
 
 %files static
 %defattr(644,root,root,755)