- up to 1.5.1

[packages/apr.git] / apr.spec

diff --git a/apr.spec b/apr.spec
index 0430d3f88b5d31c6118c10e2a6bb269c8bbd00ff..960f3df81963834a90ddff80bd4f59da114eb18b 100644 (file)
--- a/apr.spec
+++ b/apr.spec
@@ -1,23 +1,26 @@
-%bcond_with    tests
+#
+# Conditional build:
+%bcond_with    tests   # perform make test
+#
 Summary:       Apache Portable Runtime
 Summary(pl.UTF-8):     Apache Portable Runtime - przenośna biblioteka uruchomieniowa
 Name:          apr
-Version:       1.3.3
-Release:       9
+Version:       1.5.1
+Release:       1
 Epoch:         1
 License:       Apache v2.0
 Group:         Libraries
 Source0:       http://www.apache.org/dist/apr/%{name}-%{version}.tar.bz2
-# Source0-md5: 2090c21dee4f0eb1512604127dcd158f
+# Source0-md5: 5486180ec5a23efb5cae6d4292b300ab
 Patch0:                %{name}-link.patch
-Patch1:                %{name}-metuxmpm.patch
-Patch2:                %{name}-libtool.patch
-Patch3:                %{name}-bug-46425.patch
+Patch1:                %{name}-libtool.patch
+# disable some things that require recent kernel
+Patch2:                %{name}-disable-features.patch
 URL:           http://apr.apache.org/
-BuildRequires: autoconf >= 2.50
+BuildRequires: autoconf >= 2.59
 BuildRequires: automake
-BuildRequires: glibc-devel >= 6:2.9
 %if "%{pld_release}" != "ac"
+BuildRequires: glibc-devel >= 6:2.9
 BuildRequires: libtool >= 2:2.2
 %else
 BuildRequires: libtool
@@ -29,8 +32,10 @@ BuildRequires:       rpm-pythonprov
 BuildRequires: sed >= 4.0
 %if "%{pld_release}" != "ac"
 BuildRequires: uname(release) >= 2.6
-Requires:      uname(release) >= 2.6.27
+Requires:      uname(release) >= 2.6.13
 %endif
+# uuid.h misdetected from this one instead of libuuid-devel
+BuildConflicts:        ossp-uuid-devel < 1.6.2-6
 Conflicts:     kernel24
 Conflicts:     kernel24-smp
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -96,7 +101,6 @@ Statyczna biblioteka apr.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 cat >> config.layout <<'EOF'
 <Layout PLD>
@@ -124,7 +128,7 @@ install /usr/share/automake/config.* build
        --with-devrandom=/dev/urandom
 %{__make}
 
-%{?with_tests:%{__make} -j1 test}
+%{?with_tests:%{__make} -j1 check}
 
 %install
 rm -rf $RPM_BUILD_ROOT