From ae056cea920fe751d3a913582f7d8442d6aadf43 Mon Sep 17 00:00:00 2001
From: Ville Skyttä <ville.skytta@iki.fi>
Date: May 01 2011 12:23:55 +0000
Subject: Merge branch 'master' into el6


---

diff --git a/.gitignore b/.gitignore
index 1fb4523..a715bbe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/javasqlite-20110106.tar.gz
+/javasqlite-20110430.tar.gz
diff --git a/0011-Fix-highwater-handling-of-SQLite.Database.-status.patch b/0011-Fix-highwater-handling-of-SQLite.Database.-status.patch
deleted file mode 100644
index af64702..0000000
--- a/0011-Fix-highwater-handling-of-SQLite.Database.-status.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 6947cb3c6b8ec961a9b687cf689a86d1a5e31754 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
-Date: Wed, 12 Jan 2011 21:19:37 +0200
-Subject: [PATCH 11/11] Fix "highwater" handling of SQLite.Database.*status().
-
-Previously, 0 was always returned on x86 and x86_64, and ppc64
-segfaulted (at least on Fedora/RHEL).
----
- native/sqlite_jni.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/native/sqlite_jni.c b/native/sqlite_jni.c
-index 366235e..a02a258 100644
---- a/native/sqlite_jni.c
-+++ b/native/sqlite_jni.c
-@@ -4891,7 +4891,7 @@ Java_SQLite_Database__1status(JNIEnv *env, jclass cls, jint op,
-     int data[2] = { 0, 0 };
-     jint jdata[2];
- #if HAVE_SQLITE3
--    ret = sqlite3_status(op, &data[0], &data[2], flag);
-+    ret = sqlite3_status(op, &data[0], &data[1], flag);
-     if (ret == SQLITE_OK) {
- 	jdata[0] = data[0];
- 	jdata[1] = data[1];
-@@ -4921,7 +4921,7 @@ Java_SQLite_Database__1db_1status(JNIEnv *env, jobject obj, jint op,
- #else
- #if HAVE_SQLITE3
- 	ret = sqlite3_db_status((sqlite3 *) h->sqlite, op, &data[0],
--				&data[2], flag);
-+				&data[1], flag);
- #endif
- #endif
- 	if (ret == SQLITE_OK) {
--- 
-1.7.3.4
-
diff --git a/javasqlite.spec b/javasqlite.spec
index fc7b073..b544d8e 100644
--- a/javasqlite.spec
+++ b/javasqlite.spec
@@ -6,8 +6,8 @@
 %endif
 
 Name:           javasqlite
-Version:        20110106
-Release:        2%{?dist}
+Version:        20110430
+Release:        1%{?dist}
 Summary:        SQLite Java Wrapper/JDBC Driver
 
 Group:          Development/Libraries
@@ -16,8 +16,6 @@ URL:            http://www.ch-werner.de/javasqlite/
 Source0:        http://www.ch-werner.de/javasqlite/%{name}-%{version}.tar.gz
 # Fedora specific, no need to send upstream.
 Patch0:         %{name}-20090430-jnipath.patch
-# Sent upstream 2011-01-12
-Patch1:         0011-Fix-highwater-handling-of-SQLite.Database.-status.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # >= 3.4 for zeroblob stuff in %%check's test3
@@ -53,7 +51,6 @@ API documentation for %{name}.
 %prep
 %setup -q
 sed -e 's|@JNIPATH@|%{_libdir}/%{name}|' %{PATCH0} | patch -p1 --fuzz=0
-%patch1 -p1
 sed -i -e 's/\r//g' doc/ajhowto.txt
 f=ChangeLog ; iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
 
@@ -130,6 +127,12 @@ done
 
 
 %changelog
+* Sun May  1 2011 Ville Skyttä <ville.skytta@iki.fi> - 20110430-1
+- Update to 20110430, highwater patch applied upstream.
+
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 20110106-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
 * Wed Jan 12 2011 Ville Skyttä <ville.skytta@iki.fi> - 20110106-2
 - Patch to fix "highwater" handling in SQLite.Database.*status().
 - Build with Java 1.5 only on EL6 ppc64 (no 1.6 available at the moment).
diff --git a/sources b/sources
index 0bdc81f..cd7bb14 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-542a7de8af0186c61d2d68af1c14242e  javasqlite-20110106.tar.gz
+e34472b5c8ccfc48f3b3e3e6b44b5174  javasqlite-20110430.tar.gz