- up to 1.3.5

[packages/apr.git] / apr.spec

diff --git a/apr.spec b/apr.spec
index 746e8d8c3384c1b8014dc39a904eaf53b23ddeec..f2b05273f5e5fbe24dffb0e0bea4167585885567 100644 (file)
--- a/apr.spec
+++ b/apr.spec
@@ -1,18 +1,20 @@
-%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:       10
+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
@@ -31,6 +33,8 @@ BuildRequires:        sed >= 4.0
 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)
@@ -96,7 +100,6 @@ Statyczna biblioteka apr.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 cat >> config.layout <<'EOF'
 <Layout PLD>