X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=apr.spec;h=3eef83464c40b060100d67ae174be71b0c6a5866;hb=refs%2Ftags%2Fauto%2Fth%2Fapr-1_2_7-2;hp=d9190e12849da66e88378a5534a68da1c3cb9f1c;hpb=490bb9f90e874978390c4c99aabfd012af78be7d;p=packages%2Fapr.git

diff --git a/apr.spec b/apr.spec
index d9190e1..3eef834 100644
--- a/apr.spec
+++ b/apr.spec
@@ -1,23 +1,28 @@
+#
+# Conditional build:
+#
 Summary:	Apache Portable Runtime
 Summary(pl):	Apache Portable Runtime - przeno¶na biblioteka uruchomieniowa
 Name:		apr
-Version:	1.0.0
+Version:	1.2.7
 Release:	2
 Epoch:		1
 License:	Apache v2.0
 Group:		Libraries
-Source0:	http://www.apache.org/dist/apr/%{name}-%{version}.tar.gz
-# Source0-md5:	ccd5c21292581be4ba9db10ad5cc8ced
+Source0:	http://www.apache.org/dist/apr/%{name}-%{version}.tar.bz2
+# Source0-md5:	e77887dbafc515c63feac84686bcb3bc
 Patch0:		%{name}-link.patch
 Patch1:		%{name}-metuxmpm.patch
-# EPOLL PATCH: TO BE DROPPED AFTER AC
-Patch2:		%{name}-no-epoll.patch
+Patch2:		%{name}-libtool.patch
 URL:		http://apr.apache.org/
 BuildRequires:	autoconf >= 2.13
 BuildRequires:	automake
 BuildRequires:	libtool >= 1.3.3
-BuildRequires:	perl-base
+BuildRequires:	libuuid-devel
+BuildRequires:	sed >= 4.0
 BuildRequires:	python
+Conflicts:	kernel24
+Conflicts:	kernel24-smp
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_includedir	/usr/include/apr
@@ -49,6 +54,9 @@ 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
+Requires:	automake
+Requires:	libtool
 
 %description devel
 Header files and development documentation for apr.
@@ -78,6 +86,12 @@ Statyczna biblioteka apr.
 install /usr/share/automake/config.* build
 ./buildconf
 %configure \
+	--with-devrandom=/dev/urandom \
+%ifarch %{ix86} %{i8664}
+%ifnarch i386
+	--enable-nonportable-atomics \
+%endif
+%endif
 	--enable-threads
 %{__make}
 
@@ -90,12 +104,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
@@ -123,6 +142,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