rpms/javasqlite/devel javasqlite-20100709-gcj-jni.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 javasqlite.spec, 1.19, 1.20 sources, 1.9, 1.10

Ville Skyttä scop at fedoraproject.org
Sun Jul 11 08:11:34 UTC 2010


Author: scop

Update of /cvs/pkgs/rpms/javasqlite/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv30585

Modified Files:
	.cvsignore javasqlite.spec sources 
Added Files:
	javasqlite-20100709-gcj-jni.patch 
Log Message:
* 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.
- Use openjdk javadocs for crosslinking.


javasqlite-20100709-gcj-jni.patch:
 sqlite_jni.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE javasqlite-20100709-gcj-jni.patch ---
diff -up javasqlite-20100709/native/sqlite_jni.c~ javasqlite-20100709/native/sqlite_jni.c
--- javasqlite-20100709/native/sqlite_jni.c~	2010-07-09 10:14:38.000000000 +0300
+++ javasqlite-20100709/native/sqlite_jni.c	2010-07-10 11:51:07.672852975 +0300
@@ -357,7 +357,7 @@ trans2iso(JNIEnv *env, int haveutf, jstr
     dest->result = 0;
     dest->tofree = 0;
     if (haveutf) {
-#ifndef JNI_VERSION_1_2
+#if 1
 	const char *utf = (*env)->GetStringUTFChars(env, src, 0);
 
 	dest->result = dest->tofree = malloc(strlen(utf) + 1);
@@ -370,7 +370,7 @@ trans2iso(JNIEnv *env, int haveutf, jstr
 	    throwoom(env, "string translation failed");
 	    return dest->result;
 	}
-#ifndef JNI_VERSION_1_2
+#if 1
 	strcpy(dest->result, utf);
 	(*env)->ReleaseStringUTFChars(env, src, utf);
 #else


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/javasqlite/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	1 Feb 2010 17:19:04 -0000	1.9
+++ .cvsignore	11 Jul 2010 08:11:33 -0000	1.10
@@ -1 +1 @@
-javasqlite-20100131.tar.gz
+javasqlite-20100709.tar.gz


Index: javasqlite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/javasqlite/devel/javasqlite.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- javasqlite.spec	8 Jul 2010 18:02:03 -0000	1.19
+++ javasqlite.spec	11 Jul 2010 08:11:34 -0000	1.20
@@ -1,21 +1,24 @@
 Name:           javasqlite
-Version:        20100131
-Release:        3%{?dist}
+Version:        20100709
+Release:        1%{?dist}
 Summary:        SQLite Java Wrapper/JDBC Driver
 
 Group:          Development/Libraries
 License:        BSD
 URL:            http://www.ch-werner.de/javasqlite/
 Source0:        http://www.ch-werner.de/javasqlite/%{name}-%{version}.tar.gz
-# jnipath: Fedora specific, no need to send upstream.
+# 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
 BuildRequires:  sqlite-devel >= 3.4
-BuildRequires:  java-devel = 1:1.6.0
-BuildRequires:  java-devel = 1.5.0
-BuildRequires:  java-javadoc
+BuildRequires:  java-1.6.0-devel
+BuildRequires:  java-1.5.0-devel
+BuildRequires:  java-1.6.0-javadoc
 Requires:       jre
 
 %{?filter_setup:
@@ -40,6 +43,7 @@ API documentation for %{name}.
 %prep
 %setup -q
 sed -e 's|@JNIPATH@|%{_libdir}/%{name}|' %{PATCH0} | patch -p1
+%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
 
@@ -112,6 +116,11 @@ done
 
 
 %changelog
+* 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.
+- Use openjdk javadocs for crosslinking.
+
 * Thu Jul  8 2010 Ville Skyttä <ville.skytta at iki.fi> - 20100131-3
 - Include license.terms in -javadoc.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/javasqlite/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	1 Feb 2010 17:19:04 -0000	1.9
+++ sources	11 Jul 2010 08:11:34 -0000	1.10
@@ -1 +1 @@
-aa0c89534045f08e72f7b2d9538bb164  javasqlite-20100131.tar.gz
+fc24380deef57f5864cff6a0816fb6b4  javasqlite-20100709.tar.gz



More information about the scm-commits mailing list