[javasqlite] 20100727-1

Ville Skyttä scop at fedoraproject.org
Fri Aug 20 09:28:59 UTC 2010


commit 1b1f66bbd86a2660923f939a92a80e837cabf5b1
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Fri Aug 20 12:28:12 2010 +0300

    20100727-1
    
    - Update to 20100727 (#612883), gcj patch superseded upstream.

 .gitignore                        |    2 +-
 javasqlite-20100709-gcj-jni.patch |   21 ---------------------
 javasqlite.spec                   |   11 +++++------
 sources                           |    2 +-
 4 files changed, 7 insertions(+), 29 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6b8eecf..805fcf2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-javasqlite-20100709.tar.gz
+javasqlite-20100727.tar.gz
diff --git a/javasqlite.spec b/javasqlite.spec
index b7a810a..f8fd633 100644
--- a/javasqlite.spec
+++ b/javasqlite.spec
@@ -1,5 +1,5 @@
 Name:           javasqlite
-Version:        20100709
+Version:        20100727
 Release:        1%{?dist}
 Summary:        SQLite Java Wrapper/JDBC Driver
 
@@ -9,9 +9,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
-# Test suite fails with java-1.5.0-gcj w/o this, doesn't seem to hurt openjdk,
-# upstream notified 20100710
-Patch1:         %{name}-20100709-gcj-jni.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # >= 3.4 for zeroblob stuff in %%check's test3
@@ -42,8 +39,7 @@ API documentation for %{name}.
 
 %prep
 %setup -q
-sed -e 's|@JNIPATH@|%{_libdir}/%{name}|' %{PATCH0} | patch -p1
-%patch1 -p1
+sed -e 's|@JNIPATH@|%{_libdir}/%{name}|' %{PATCH0} | patch -p1 --fuzz=0
 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
 
@@ -116,6 +112,9 @@ done
 
 
 %changelog
+* Fri Aug 20 2010 Ville Skyttä <ville.skytta at iki.fi> - 20100727-1
+- Update to 20100727 (#612883), gcj patch superseded upstream.
+
 * Sat Jul 10 2010 Ville Skyttä <ville.skytta at iki.fi> - 20100709-1
 - Update to 20100709 (#612883).
 - Patch to fix failures with java-1.5.0-gcj.
diff --git a/sources b/sources
index 59c67c3..7bc4e64 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fc24380deef57f5864cff6a0816fb6b4  javasqlite-20100709.tar.gz
+f8d14192929a21ce340997c2766fa494  javasqlite-20100727.tar.gz


More information about the scm-commits mailing list