From 23fe783aba56e54cf82b7795708f35200fceebf5 Mon Sep 17 00:00:00 2001
From: Bojan Smojver <bojan@rexursive.com>
Date: May 10 2011 02:50:04 +0000
Subject: Attempt to fix incorrect top_builddir in apr_rules.mk.


---

diff --git a/apr-1.4.4-top_builddir.patch b/apr-1.4.4-top_builddir.patch
new file mode 100644
index 0000000..311ca52
--- /dev/null
+++ b/apr-1.4.4-top_builddir.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.in.orig	2008-05-03 03:04:46.000000000 +1000
++++ b/Makefile.in	2011-05-10 12:42:31.428378451 +1000
+@@ -66,7 +66,7 @@
+ 
+ # Create apr_rules.mk suitable for the install tree
+ build/apr_rules.out: build/apr_rules.mk
+-	sed 's,^\(apr_build.*=\).*$$,\1$(installbuilddir),' < build/apr_rules.mk > $@
++	sed -e 's,^\(apr_build.*=\).*$$,\1$(installbuilddir),' -e 's,^\(top_build.*=\).*$$,\1$(installbuilddir),' < build/apr_rules.mk > $@
+ 
+ install: $(TARGETS)
+ 	$(APR_MKDIR) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) $(DESTDIR)$(installbuilddir) \
diff --git a/apr.spec b/apr.spec
index 0903008..fb94bfd 100644
--- a/apr.spec
+++ b/apr.spec
@@ -6,7 +6,7 @@
 Summary: Apache Portable Runtime library
 Name: apr
 Version: 1.4.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: ASL 2.0
 Group: System Environment/Libraries
 URL: http://apr.apache.org/
@@ -16,6 +16,7 @@ Patch1: apr-0.9.7-deepbind.patch
 Patch2: apr-1.2.2-locktimeout.patch
 Patch3: apr-1.2.2-libdir.patch
 Patch4: apr-1.2.7-pkgconf.patch
+Patch5: apr-1.4.4-top_builddir.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires: autoconf, libtool, libuuid-devel, python
 # To enable SCTP support
@@ -45,6 +46,7 @@ C data structures and routines.
 %patch2 -p1 -b .locktimeout
 %patch3 -p1 -b .libdir
 %patch4 -p1 -b .pkgconf
+%patch5 -p1 -b .top_builddir
 
 %build
 # regenerate configure script etc.
@@ -125,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Tue May 10 2011 Bojan Smojver <bojan@rexursive.com> - 1.4.4-2
+- fix top_builddir in apr_rules.mk
+
 * Mon May  9 2011 Bojan Smojver <bojan@rexursive.com> - 1.4.4-1
 - bump up to 1.4.4