rpms/javasqlite/F-10 javasqlite-20081006-jnipath.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 javasqlite.spec, 1.5, 1.6 sources, 1.3, 1.4 javasqlite-20080315-jnipath.patch, 1.1, NONE javasqlite-20080420-loadfail.patch, 1.1, NONE javasqlite-20080420-tests.patch, 1.1, NONE
Ville Skyttä
scop at fedoraproject.org
Sun Nov 30 12:24:46 UTC 2008
- Previous message (by thread): rpms/javasqlite/F-9 javasqlite-20081006-jnipath.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 javasqlite.spec, 1.3, 1.4 sources, 1.3, 1.4 javasqlite-20080315-jnipath.patch, 1.1, NONE
- Next message (by thread): rpms/javasqlite/EL-5 javasqlite-20081006-jnipath.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 javasqlite.spec, 1.2, 1.3 sources, 1.2, 1.3 javasqlite-20080315-jnipath.patch, 1.1, NONE javasqlite-20080420-loadfail.patch, 1.1, NONE javasqlite-20080420-tests.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: scop
Update of /cvs/pkgs/rpms/javasqlite/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13261/F-10
Modified Files:
.cvsignore javasqlite.spec sources
Added Files:
javasqlite-20081006-jnipath.patch
Removed Files:
javasqlite-20080315-jnipath.patch
javasqlite-20080420-loadfail.patch
javasqlite-20080420-tests.patch
Log Message:
* Sun Nov 30 2008 Ville Skyttä <ville.skytta at iki.fi> - 20081006-2
- Own the /usr/lib*/javasqlite dir (#473609).
* Tue Oct 07 2008 Ville Skyttä <ville.skytta at iki.fi> - 20081006-1
- 20081006; all upstreamable patches applied upstream.
javasqlite-20081006-jnipath.patch:
--- NEW FILE javasqlite-20081006-jnipath.patch ---
diff -up javasqlite-20081006/Makefile.in.orig javasqlite-20081006/Makefile.in
--- javasqlite-20081006/Makefile.in.orig 2008-10-06 11:05:57.000000000 +0300
+++ javasqlite-20081006/Makefile.in 2008-10-07 19:54:02.000000000 +0300
@@ -150,16 +150,16 @@ configure: configure.in
test:
$(JAVAC) -classpath sqlite.jar:$(PWD) test.java
LD_LIBRARY_PATH="$$LD_LIBRARY_PATH:$(PWD)/.libs" \
- $(JAVA_RUN) -classpath sqlite.jar:$(PWD) test
+ $(JAVA_RUN) -classpath sqlite.jar:$(PWD) -DSQLite.library.path=$(PWD)/.libs test
test2: test
LD_LIBRARY_PATH="$$LD_LIBRARY_PATH:$(PWD)/.libs" \
- $(JAVA_RUN) -classpath sqlite.jar:$(PWD) test db2
+ $(JAVA_RUN) -classpath sqlite.jar:$(PWD) -DSQLite.library.path=$(PWD)/.libs test db2
test3:
$(JAVAC) -classpath sqlite.jar:$(PWD) test3.java
LD_LIBRARY_PATH="$$LD_LIBRARY_PATH:$(PWD)/.libs" \
- $(JAVA_RUN) -classpath sqlite.jar:$(PWD) test3
+ $(JAVA_RUN) -classpath sqlite.jar:$(PWD) -DSQLite.library.path=$(PWD)/.libs test3
clean:
$(RM) SQLite/*.class SQLite/@JDBCVER@/*.class *.lo *.la *.o *~ \
diff -up javasqlite-20081006/SQLite/Database.java.orig javasqlite-20081006/SQLite/Database.java
--- javasqlite-20081006/SQLite/Database.java.orig 2008-10-06 11:03:04.000000000 +0300
+++ javasqlite-20081006/SQLite/Database.java 2008-10-07 19:51:00.000000000 +0300
@@ -783,7 +783,7 @@ public class Database {
try {
String path = System.getProperty("SQLite.library.path");
if (path == null || path.length() == 0) {
- System.loadLibrary("sqlite_jni");
+ System.load("@JNIPATH@/" + System.mapLibraryName("sqlite_jni"));
} else {
try {
java.lang.reflect.Method mapLibraryName;
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/javasqlite/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 22 Apr 2008 16:22:11 -0000 1.3
+++ .cvsignore 30 Nov 2008 12:24:15 -0000 1.4
@@ -1 +1 @@
-javasqlite-20080420.tar.gz
+javasqlite-20081006.tar.gz
Index: javasqlite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/javasqlite/F-10/javasqlite.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- javasqlite.spec 1 Sep 2008 18:52:29 -0000 1.5
+++ javasqlite.spec 30 Nov 2008 12:24:15 -0000 1.6
@@ -1,6 +1,6 @@
Name: javasqlite
-Version: 20080420
-Release: 3%{?dist}
+Version: 20081006
+Release: 2%{?dist}
Summary: SQLite Java Wrapper/JDBC Driver
Group: Development/Libraries
@@ -8,10 +8,7 @@
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.
-Patch0: %{name}-20080315-jnipath.patch
-# loadfail, tests: Sent upstream 20080830.
-Patch1: %{name}-20080420-loadfail.patch
-Patch2: %{name}-20080420-tests.patch
+Patch0: %{name}-20081006-jnipath.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: sqlite-devel
@@ -37,8 +34,6 @@
%prep
%setup -q
sed -e 's|@JNIPATH@|%{_libdir}/%{name}|' %{PATCH0} | patch -p1
-%patch1 -p1
-%patch2 -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
@@ -79,20 +74,19 @@
%check
-
-# LD_LIBRARY_PATH: prevent falling back to system installed library in case
-# loading the just built one fails, see static initializer in SQLite.Database.
-export LD_LIBRARY_PATH="$PWD/.libs:$LD_LIBRARY_PATH"
-
+origpath="$PATH"
for javaver in 1.5.0 1.6.0 ; do
+ jdir=%{_jvmdir}/java-$javaver/bin
+ export PATH="$jdir:$origpath" # bug 460761
# test2 is for SQLite 2.x, which we don't support
- make JAVA_RUN="%{_jvmdir}/java-$javaver/bin/java" test test3
+ make JAVA_RUN="$jdir/java" JAVAC="$jdir/javac" test test3
done
%files
%defattr(-,root,root,-)
%doc ChangeLog license.terms
+%dir %{_libdir}/%{name}/
%{_libdir}/%{name}/sqlite.jar
%{_libdir}/%{name}/libsqlite_jni.so
@@ -102,6 +96,12 @@
%changelog
+* Sun Nov 30 2008 Ville Skyttä <ville.skytta at iki.fi> - 20081006-2
+- Own the /usr/lib*/javasqlite dir (#473609).
+
+* Tue Oct 7 2008 Ville Skyttä <ville.skytta at iki.fi> - 20081006-1
+- 20081006; all upstreamable patches applied upstream.
+
* Mon Sep 1 2008 Ville Skyttä <ville.skytta at iki.fi> - 20080420-3
- Include JDBC 3 (Java 1.5.x) drivers.
- Work around build setup issues #460761 and #460783.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/javasqlite/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 22 Apr 2008 16:22:11 -0000 1.3
+++ sources 30 Nov 2008 12:24:15 -0000 1.4
@@ -1 +1 @@
-1ca6eca130049d888a3f8783261bcdf8 javasqlite-20080420.tar.gz
+f8aee5c34cf7248c89d8fa2f3711bca2 javasqlite-20081006.tar.gz
--- javasqlite-20080315-jnipath.patch DELETED ---
--- javasqlite-20080420-loadfail.patch DELETED ---
--- javasqlite-20080420-tests.patch DELETED ---
- Previous message (by thread): rpms/javasqlite/F-9 javasqlite-20081006-jnipath.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 javasqlite.spec, 1.3, 1.4 sources, 1.3, 1.4 javasqlite-20080315-jnipath.patch, 1.1, NONE
- Next message (by thread): rpms/javasqlite/EL-5 javasqlite-20081006-jnipath.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 javasqlite.spec, 1.2, 1.3 sources, 1.2, 1.3 javasqlite-20080315-jnipath.patch, 1.1, NONE javasqlite-20080420-loadfail.patch, 1.1, NONE javasqlite-20080420-tests.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list