From 5b71dca19fdf7a2a48167ee0078d4b8d0ed83849 Mon Sep 17 00:00:00 2001
From: jorton <jorton@fedoraproject.org>
Date: Feb 09 2005 09:12:28 +0000
Subject: - update to 0.9.6


---

diff --git a/.cvsignore b/.cvsignore
index 3d8580d..bd01d4a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,4 +1 @@
-*.src.rpm
-clog
-apr-0.9.5
-apr-0.9.5.tar.gz
+apr-0.9.6.tar.gz
diff --git a/apr.spec b/apr.spec
index 95b50c7..b578daa 100644
--- a/apr.spec
+++ b/apr.spec
@@ -3,22 +3,19 @@
 
 Summary: Apache Portable Runtime library
 Name: apr
-Version: 0.9.5
-Release: 4
+Version: 0.9.6
+Release: 1
 License: Apache Software License
 Group: System Environment/Libraries
 URL: http://apr.apache.org/
 Source0: %{name}-%{version}.tar.gz
-Patch2: apr-0.9.3-testrand.patch
 Patch3: apr-0.9.3-noipv6.patch
 Patch4: apr-0.9.4-trimlibs.patch
 Patch6: apr-0.9.4-tests.patch
 Patch10: apr-0.9.4-cflags.patch
 Patch16: apr-0.9.4-mutextype.patch
 Patch18: apr-0.9.4-stacksize.patch
-Patch20: apr-0.9.4-nested.patch
 Patch21: apr-0.9.4-lp64psem.patch
-Patch22: apr-0.9.5-sendfiles390.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildPrereq: autoconf, libtool, doxygen
 Conflicts: subversion < 0.20.1-2
@@ -43,15 +40,12 @@ C data structures and routines.
 
 %prep
 %setup -q
-%patch2 -p1 -b .testrand
 %patch3 -p1 -b .noipv6
 %patch4 -p1 -b .trimlibs
 %patch6 -p1 -b .tests
 %patch10 -p1 -b .cflags
 %patch18 -p1 -b .stacksize
-%patch20 -p1 -b .nested
 %patch21 -p1 -b .lp64psem
-%patch22 -p1 -b .sendfiles390
 
 %build
 # regenerate configure script etc.
@@ -65,13 +59,9 @@ make %{?_smp_mflags} CFLAGS=-Wall && make dox
 
 %check
 # Run non-interactive tests
-%ifarch x86_64
-# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=97611
-excludes=testlock
-%endif
 pushd test
 make %{?_smp_mflags} testall CFLAGS=-fno-strict-aliasing
-TZ=PST8PDT ./testall -v ${excludes+-x $excludes} || exit 1
+TZ=PST8PDT ./testall -v || exit 1
 popd
 
 %install
@@ -128,6 +118,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/apr-%{aprver}/*.h
 
 %changelog
+* Wed Feb  9 2005 Joe Orton <jorton@redhat.com> 0.9.6-1
+- update to 0.9.6
+
 * Wed Feb  2 2005 Joe Orton <jorton@redhat.com> 0.9.5-4
 - don't disable sendfile on s390 (IBM LTC, #146891)
 
diff --git a/sources b/sources
index f0e67c0..b1ff6c3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f764a8f23c9ae58ca4726f2716a100e7  apr-0.9.5.tar.gz
+b7e4c52cccb421b42a41b0bed5a9f9bc  apr-0.9.6.tar.gz
diff --git a/upstream b/upstream
index 8d0bd4f..bd01d4a 100644
--- a/upstream
+++ b/upstream
@@ -1 +1 @@
-apr-0.9.5.tar.gz
+apr-0.9.6.tar.gz