- TLDized, added upstream fixes

diff --git a/apr.spec b/apr.spec
index 33bf163884a9169e7284daaf301fea320fff5594..4f1d63621f9b1cf9f81f4596f08551025c5072e9 100644 (file)
--- a/apr.spec
+++ b/apr.spec
@@ -6,7 +6,7 @@ Summary:        Apache Portable Runtime
 Summary(pl.UTF-8):     Apache Portable Runtime - przenośna biblioteka uruchomieniowa
 Name:          apr
 Version:       1.5.1
-Release:       2
+Release:       3
 Epoch:         1
 License:       Apache v2.0
 Group:         Libraries
@@ -16,24 +16,19 @@ Patch0:             %{name}-link.patch
 Patch1:                %{name}-libtool.patch
 # disable some things that require recent kernel
 Patch2:                %{name}-disable-features.patch
+Patch3:                %{name}-svn.patch
 URL:           http://apr.apache.org/
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake
-%if "%{pld_release}" != "ac"
 BuildRequires: glibc-devel >= 6:2.9
 BuildRequires: libtool >= 2:2.2
-%else
-BuildRequires: libtool
-%endif
 BuildRequires: libuuid-devel
 BuildRequires: python
 BuildRequires: rpm >= 4.4.9-56
 BuildRequires: rpm-pythonprov
 BuildRequires: sed >= 4.0
-%if "%{pld_release}" != "ac"
 BuildRequires: uname(release) >= 2.6
 Requires:      uname(release) >= 2.6.28
-%endif
 # uuid.h misdetected from this one instead of libuuid-devel
 BuildConflicts:        ossp-uuid-devel < 1.6.2-6
 Conflicts:     kernel24
@@ -70,11 +65,7 @@ Summary(pl.UTF-8):   Pliki nagłówkowe i dokumentacja programisty do apr
 Group:         Development/Libraries
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 Requires:      automake
-%if "%{pld_release}" != "ac"
 Requires:      libtool >= 2:2.2
-%else
-Requires:      libtool
-%endif
 Requires:      libuuid-devel
 Requires:      python-modules
 
@@ -101,9 +92,10 @@ Statyczna biblioteka apr.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 cat >> config.layout <<'EOF'
-<Layout PLD>
+<Layout TLD>
 sbindir:       %{_sbindir}
 libexecdir:    %{_libdir}/apr
 installbuilddir: ${datadir}/build-${APR_MAJOR_VERSION}
@@ -118,7 +110,7 @@ install /usr/share/automake/config.* build
 %{__autoconf}
 
 %configure \
-       --enable-layout=PLD \
+       --enable-layout=TLD \
 %ifarch %{ix86} %{x8664}
 %ifnarch i386
        --enable-nonportable-atomics \