From 6a9963b181ffbefb4c07703e45d9108fac851415 Mon Sep 17 00:00:00 2001
From: bojan <bojan@fedoraproject.org>
Date: Mon, 26 Nov 2007 09:59:06 +0000
Subject: [PATCH] Bump up to 1.2.12 Add dist to release to keep make consistent
 with apr-util     Remove a hunk from a patch (applied upstream)

---
 .cvsignore                 |  2 +-
 apr-1.2.7-psprintfpi.patch | 10 ----------
 apr.spec                   |  9 +++++++--
 sources                    |  2 +-
 4 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index ebddc2f..e2bd10a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-apr-1.2.11.tar.bz2
+apr-1.2.12.tar.bz2
diff --git a/apr-1.2.7-psprintfpi.patch b/apr-1.2.7-psprintfpi.patch
index d6bba56..cf053db 100644
--- a/apr-1.2.7-psprintfpi.patch
+++ b/apr-1.2.7-psprintfpi.patch
@@ -40,16 +40,6 @@
      return suite;
 --- apr-1.2.7/strings/apr_snprintf.c.psprintfpi
 +++ apr-1.2.7/strings/apr_snprintf.c
-@@ -463,7 +463,8 @@
- }
- 
- 
--
-+/* Must be passed a buffer of size NUM_BUF_SIZE where buf_end points
-+ * to 1 byte past the end of the buffer. */
- static char *conv_apr_sockaddr(apr_sockaddr_t *sa, char *buf_end, apr_size_t *len)
- {
-     char *p = buf_end;
 @@ -473,7 +474,14 @@
  
      p = conv_10(sa->port, TRUE, &is_negative, p, &sub_len);
diff --git a/apr.spec b/apr.spec
index 11518da..5c55bf0 100644
--- a/apr.spec
+++ b/apr.spec
@@ -5,8 +5,8 @@
 
 Summary: Apache Portable Runtime library
 Name: apr
-Version: 1.2.11
-Release: 2
+Version: 1.2.12
+Release: 1%{?dist}
 License: ASL 2.0
 Group: System Environment/Libraries
 URL: http://apr.apache.org/
@@ -121,6 +121,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/apr-%{aprver}/*.h
 
 %changelog
+* Mon Nov 26 2007 Bojan Smojver <bojan@rexursive.com> 1.2.12-1
+- bump up to 1.2.12
+- add dist
+- remove a comment from apr-1.2.7-psprintfpi.patch (applied upstream)
+
 * Tue Sep 18 2007 Joe Orton <jorton@redhat.com> 1.2.11-2
 - fix %%check for non-multilib 64-bit platforms
 
diff --git a/sources b/sources
index bc202b4..b2f7dc6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-22ede19520beb37dc17e62592b06a59c  apr-1.2.11.tar.bz2
+c5da94517e3918f0f2b2e0a05f56aa21  apr-1.2.12.tar.bz2