From 3d244a2e8b1e41bc146b69c221f7f0d3439facf7 Mon Sep 17 00:00:00 2001
From: jorton <jorton@fedoraproject.org>
Date: Apr 06 2006 12:22:56 +0000
Subject: - update to 1.2.6


---

diff --git a/.cvsignore b/.cvsignore
index 60ccfb6..3a7e158 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
-apr-0.9.7.tar.gz
+apr-1.2.6.tar.gz
+clog
diff --git a/apr.spec b/apr.spec
index e2818a7..9272226 100644
--- a/apr.spec
+++ b/apr.spec
@@ -2,21 +2,16 @@
 
 Summary: Apache Portable Runtime library
 Name: apr
-Version: 1.2.2
-Release: 7.2
+Version: 1.2.6
+Release: 2
 License: Apache Software License
 Group: System Environment/Libraries
 URL: http://apr.apache.org/
 Source0: %{name}-%{version}.tar.gz
 Patch1: apr-0.9.6-readdir64.patch
-Patch2: apr-0.9.6-procexit.patch
 Patch3: apr-0.9.7-deepbind.patch
-Patch4: apr-1.2.2-chdirwarn.patch
-Patch5: apr-1.2.2-reuseaddr.patch
 Patch6: apr-1.2.2-locktimeout.patch
 Patch7: apr-1.2.2-libdir.patch
-Patch8: apr-1.2.2-seekflush.patch
-Patch9: apr-1.2.2-random.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildPrereq: autoconf, libtool, doxygen
 Conflicts: subversion < 0.20.1-2
@@ -43,14 +38,9 @@ C data structures and routines.
 %prep
 %setup -q
 %patch1 -p1 -b .readdir64
-%patch2 -p1 -b .procexit
 %patch3 -p1 -b .deepbind
-%patch4 -p1 -b .chdirwarn
-%patch5 -p1 -b .reuseaddr
 %patch6 -p1 -b .locktimeout
 %patch7 -p1 -b .libdir
-%patch8 -p1 -b .seekflush
-%patch9 -p1 -b .random
 
 %build
 # regenerate configure script etc.
@@ -60,11 +50,6 @@ C data structures and routines.
 # does not use -lrt).
 export ac_cv_search_shm_open=no
 
-# Forcibly prevent detection of pthread_mutexattr_setrobust_np,
-# which doesn't seem to work.
-export ac_cv_func_pthread_mutexattr_setrobust_np=no
-export apr_cv_setrobust_with_prio_inherit=no
-
 %configure \
         --includedir=%{_includedir}/apr-%{aprver} \
         --with-installbuilddir=%{_libdir}/apr-%{aprver}/build \
@@ -127,6 +112,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/apr-%{aprver}/*.h
 
 %changelog
+* Thu Apr  6 2006 Joe Orton <jorton@redhat.com> 1.2.6-2
+- update to 1.2.6
+
 * Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 1.2.2-7.2
 - bump again for double-long bug on ppc(64)
 
diff --git a/sources b/sources
index 4c5739b..e88a80a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f96e3b04ccf86ed28a0734d7efc5bb65  apr-1.2.2.tar.gz
+d36790357acd43224000a2e493d7c701  apr-1.2.6.tar.gz
diff --git a/upstream b/upstream
index f5ba7c8..e2c32d0 100644
--- a/upstream
+++ b/upstream
@@ -1 +1 @@
-apr-1.2.2.tar.gz
+apr-1.2.6.tar.gz