[javasqlite] Remove some more 1.6 specific code missed before
Deepak Bhole
dbhole at fedoraproject.org
Wed Jan 25 15:50:54 UTC 2012
commit f828f13a993a985cb5a02022ecac49efbf39e129
Author: Deepak Bhole <dbhole at redhat.com>
Date: Wed Jan 25 10:50:33 2012 -0500
Remove some more 1.6 specific code missed before
javasqlite.spec | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/javasqlite.spec b/javasqlite.spec
index 2b3e957..04796f8 100644
--- a/javasqlite.spec
+++ b/javasqlite.spec
@@ -64,10 +64,10 @@ common_flags="
"
# We build both JDBC 3 and 4 drivers here so the resulting jar includes both,
-# and in a way that the classfiles are usable with both Java 1.5 and 1.6.
+# and in a way that the classfiles are usable with both Java 1.5 and >= 1.6.
# The idea is to first build the JDBC 3 driver and common files with Java 1.5,
-# then JDBC 4 and remaining files with Java 1.6, the desired result being that
-# the Java 1.6 build will not recompile the common class files that were
+# then JDBC 4 and remaining files with Java >= 1.6, the desired result being that
+# the Java >= 1.6 build will not recompile the common class files that were
# previously built with 1.5.
# Pass #1: JDBC 3 driver and common files with 1.5.0
@@ -75,7 +75,7 @@ export PATH="%{_jvmdir}/java-1.5.0/bin:$origpath" # bug 460761
%configure $common_flags --with-jdk=%{_jvmdir}/java-1.5.0
make sqlite.jar JAVAC_FLAGS="-source 5" # Java build not parallel clean
-# Pass #2: JDBC 4 driver and the rest with 1.6.0
+# Pass #2: JDBC 4 driver and the rest with >= 1.6.0
%if 0%{?only15}
make %{?_smp_mflags}
%else
@@ -104,8 +104,8 @@ rm -rf $RPM_BUILD_ROOT
%check
origpath="$PATH"
-for javaver in 1.5.0 %{!?only15:1.6.0} ; do
- jdir=%{_jvmdir}/java-$javaver/bin
+for javaver in -1.5.0 %{!?only15:} ; 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="$jdir/java" JAVAC="$jdir/javac" test test3
More information about the scm-commits
mailing list