- rel3, use /dev/urandom instead of /dev/random.

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

diff --git a/apr-compat.spec b/apr-compat.spec
index 08252cb60de0402d7b21094ddfa189f57d9f5fa8..d979d856d36d69a7dc885734ca280152cdac9a45 100644 (file)
--- a/apr-compat.spec
+++ b/apr-compat.spec
@@ -1,18 +1,23 @@
 Summary:       Apache Portable Runtime
 Summary(pl):   Apache Portable Runtime - przeno¶na biblioteka uruchomieniowa
 Name:          apr
-Version:       0.9.4
-Release:       1
+Version:       1.0.1
+Release:       3
 Epoch:         1
-License:       GPL
+License:       Apache v2.0
 Group:         Libraries
 Source0:       http://www.apache.org/dist/apr/%{name}-%{version}.tar.gz
-# Source0-md5: 0f1e6765532dd581a58d69b35adeecfe
+# Source0-md5: 0a3cb911ea1823cfa3e5863892774705
 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: perl-base
+BuildRequires: python
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _includedir     /usr/include/apr
@@ -30,7 +35,7 @@ take advantage of platform-specific deficiencies or features.
 
 %description -l pl
 Celem projektu APR (Apache Portable Runtime) jest stworzenie i
-utrzymywanie bibliotek dostarcaj±cych przewidywalnego i spójnego
+utrzymywanie bibliotek dostarczaj±cych przewidywalnego i spójnego
 interfejsu do le¿±cych u podstaw implementacji zale¿nych od platformy.
 G³ównym celem jest dostarczenie API, którego mog± u¿ywaæ programi¶ci
 maj±c pewno¶æ, ¿e zachowuje siê w sposób przewidywalny, je¶li nie
@@ -65,11 +70,20 @@ Statyczna biblioteka apr.
 
 %prep
 %setup -q
-%patch -p1 -b .orig
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
+install /usr/share/automake/config.* build
 ./buildconf
 %configure \
+       --with-devrandom=/dev/urandom \
+%ifarch %{ix86}
+%ifnarch i386
+       --enable-nonportable-atomics \
+%endif
+%endif
        --enable-threads
 %{__make}
 
@@ -81,10 +95,13 @@ 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#$RPM_BUILD_DIR/%{name}-%{version}#%{_datadir}#g" $RPM_BUILD_ROOT%{_bindir}/*
-%{__perl} -pi -e "s#$RPM_BUILD_DIR/%{name}-%{version}.*#%{_datadir}/build#g" $RPM_BUILD_ROOT%{_datadir}/build/*
+%{__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@' \
+       $RPM_BUILD_ROOT%{_datadir}/build/apr_rules.mk
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -94,7 +111,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc CHANGES STATUS docs/*.html
+%doc CHANGES docs/*.html
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
 
 %files devel
@@ -112,6 +129,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)