- up to 1.3.5

[packages/apr.git] / apr.spec

diff --git a/apr.spec b/apr.spec
index f8f6ecf224c37329619aa3cd71c1618699e14802..f2b05273f5e5fbe24dffb0e0bea4167585885567 100644 (file)
--- a/apr.spec
+++ b/apr.spec
@@ -1,20 +1,24 @@
+#
+# 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:       7
+Version:       1.3.5
+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: 9ac9a00eaa190937fdbbde7b4f03ac1e
 Patch0:                %{name}-link.patch
-Patch1:                %{name}-metuxmpm.patch
-Patch2:                %{name}-libtool.patch
-Patch3:                %{name}-bug-46425.patch
+Patch1:                %{name}-libtool.patch
+Patch2:                %{name}-bug-46425.patch
 URL:           http://apr.apache.org/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
+BuildRequires: glibc-devel >= 6:2.9
 %if "%{pld_release}" != "ac"
 BuildRequires: libtool >= 2:2.2
 %else
@@ -26,9 +30,11 @@ BuildRequires:       rpm >= 4.4.9-56
 BuildRequires: rpm-pythonprov
 BuildRequires: sed >= 4.0
 %if "%{pld_release}" != "ac"
-BuildRequires: uname(release) >= 2.6.27
-Requires:      uname(release) >= 2.6.27
+BuildRequires: uname(release) >= 2.6
+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)
@@ -94,7 +100,6 @@ Statyczna biblioteka apr.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p0
 
 cat >> config.layout <<'EOF'
 <Layout PLD>
@@ -122,6 +127,8 @@ install /usr/share/automake/config.* build
        --with-devrandom=/dev/urandom
 %{__make}
 
+%{?with_tests:%{__make} -j1 test}
+
 %install
 rm -rf $RPM_BUILD_ROOT