X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=apr.spec;h=73e3f9e26086df10a03eaa74600d991e69eb6137;hb=e4cdee0d10aff859e35151840758a3f3ad438b36;hp=c6733cd4a1d932d12341afd4a5b0e31875ff1bfa;hpb=af4e4c478d3ce93b6a70520dfb2b4df51c379c4d;p=packages%2Fapr.git

diff --git a/apr.spec b/apr.spec
index c6733cd..73e3f9e 100644
--- 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:	1.0.0
-Release:	0.1
+Version:	1.1.1
+Release:	4
 Epoch:		1
 License:	Apache v2.0
 Group:		Libraries
 Source0:	http://www.apache.org/dist/apr/%{name}-%{version}.tar.gz
-# Source0-md5:	ccd5c21292581be4ba9db10ad5cc8ced
-#Patch0:		%{name}-0.9.4_0.9.5.patch.gz
-#Patch1:		%{name}-link.patch
-Patch2:		%{name}-metuxmpm.patch
-#Patch3:		%{name}-modes.patch	-- obsolete
+# 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.
@@ -69,14 +72,24 @@ Statyczna biblioteka apr.
 
 %prep
 %setup -q
-#patch0 -p1
-#patch1 -p1
+%patch0 -p1
+%patch1 -p1
 %patch2 -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}
 
@@ -88,11 +101,13 @@ rm -rf $RPM_BUILD_ROOT
 
 ln -sf %{_bindir}/libtool $RPM_BUILD_ROOT%{_datadir}/libtool
 
-install build/{*apr*.m4,*.awk,*.sh,config.*} $RPM_BUILD_ROOT%{_datadir}/build-1
+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-1@' \
-	$RPM_BUILD_ROOT%{_datadir}/build-1/apr_rules.mk
+	$RPM_BUILD_ROOT%{_datadir}/build/apr_rules.mk
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -113,13 +128,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/apr.exp
 %{_includedir}
 %dir %{_datadir}
-%dir %{_datadir}/build-1
-%{_datadir}/build-1/*.mk
-%{_datadir}/build-1/*.m4
-%{_datadir}/build-1/*.awk
-%attr(755,root,root) %{_datadir}/build-1/config.*
-%attr(755,root,root) %{_datadir}/build-1/*.sh
-%attr(755,root,root) %{_datadir}/build-1/libtool
+%dir %{_datadir}/build
+%{_datadir}/build/*.mk
+%{_datadir}/build/*.m4
+%{_datadir}/build/*.awk
+%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