- enable epoll, sendfile64, tcpnodelaycork for Th

[packages/apr.git] / apr.spec

diff --git a/apr.spec b/apr.spec
index 7fb2dfc92648032c2775194a6e28ff690d45bc92..3eef83464c40b060100d67ae174be71b0c6a5866 100644 (file)
--- a/apr.spec
+++ b/apr.spec
@@ -1,18 +1,28 @@
+#
+# Conditional build:
+#
 Summary:       Apache Portable Runtime
 Summary(pl):   Apache Portable Runtime - przeno¶na biblioteka uruchomieniowa
 Name:          apr
-Version:       0.9.4
-Release:       1
+Version:       1.2.7
+Release:       2
 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:       http://www.apache.org/dist/apr/%{name}-%{version}.tar.bz2
+# Source0-md5: e77887dbafc515c63feac84686bcb3bc
 Patch0:                %{name}-link.patch
+Patch1:                %{name}-metuxmpm.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
@@ -44,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.
@@ -65,11 +78,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} %{i8664}
+%ifnarch i386
+       --enable-nonportable-atomics \
+%endif
+%endif
        --enable-threads
 %{__make}
 
@@ -81,10 +103,18 @@ 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
+mv -f $RPM_BUILD_ROOT%{_datadir}/build-1 $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#$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/*
+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
@@ -94,7 +124,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 +142,9 @@ 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
 
 %files static
 %defattr(644,root,root,755)