gil pushed to javasqlite (master). "update to 20150417 (rhbz#1213025)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Sat Apr 18 02:27:17 UTC 2015
>From acc37400ae4f24dfced7718cf84d42b9b48e6e72 Mon Sep 17 00:00:00 2001
From: gil <puntogil at libero.it>
Date: Sat, 18 Apr 2015 04:26:55 +0200
Subject: update to 20150417 (rhbz#1213025)
diff --git a/0001-Make-buildable-with-Java-1.8.patch b/0001-Make-buildable-with-Java-1.8.patch
deleted file mode 100644
index b56a92c..0000000
--- a/0001-Make-buildable-with-Java-1.8.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 36e836c23857efec68d8788985e9e475f8710283 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta at iki.fi>
-Date: Thu, 26 Jun 2014 12:55:38 +0300
-Subject: [PATCH] Make buildable with Java 1.8
-
----
- configure | 2 +-
- configure.in | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure b/configure
-index cd012c7..fda57ea 100755
---- a/configure
-+++ b/configure
-@@ -11615,7 +11615,7 @@ if test "x$JDBCVER" = "x" ; then
- $JAVA_RUN -version 2>&1 | grep 'version "1.4' >/dev/null && JDBCVER=JDBC2x
- $JAVA_RUN -version 2>&1 | grep 'version "1.5' >/dev/null && JDBCVER=JDBC2y
- $JAVA_RUN -version 2>&1 | grep 'version "1.6' >/dev/null && JDBCVER=JDBC2z
-- $JAVA_RUN -version 2>&1 | grep 'version "1.7' >/dev/null && JDBCVER=JDBC2z1
-+ $JAVA_RUN -version 2>&1 | grep 'version "1.[78]' >/dev/null && JDBCVER=JDBC2z1
- $JAVA_RUN -version 2>&1 | grep 'JSR169' >/dev/null && JDBCVER=JDBC0
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: overriding JDBC driver: $JDBCVER" >&5
-diff --git a/configure.in b/configure.in
-index 317fc0e..c620bb6 100644
---- a/configure.in
-+++ b/configure.in
-@@ -565,7 +565,7 @@ if test "x$JDBCVER" = "x" ; then
- $JAVA_RUN -version 2>&1 | grep 'version "1.4' >/dev/null && JDBCVER=JDBC2x
- $JAVA_RUN -version 2>&1 | grep 'version "1.5' >/dev/null && JDBCVER=JDBC2y
- $JAVA_RUN -version 2>&1 | grep 'version "1.6' >/dev/null && JDBCVER=JDBC2z
-- $JAVA_RUN -version 2>&1 | grep 'version "1.7' >/dev/null && JDBCVER=JDBC2z1
-+ $JAVA_RUN -version 2>&1 | grep 'version "1.[78]' >/dev/null && JDBCVER=JDBC2z1
- $JAVA_RUN -version 2>&1 | grep 'JSR169' >/dev/null && JDBCVER=JDBC0
- else
- AC_MSG_WARN([overriding JDBC driver: $JDBCVER])
---
-1.9.3
-
diff --git a/javasqlite-20150417-javadoc.patch b/javasqlite-20150417-javadoc.patch
new file mode 100644
index 0000000..3e5f3bb
--- /dev/null
+++ b/javasqlite-20150417-javadoc.patch
@@ -0,0 +1,30 @@
+diff -Nru javasqlite-20150417/SQLite/Database.java javasqlite-20150417.java8doc/SQLite/Database.java
+--- javasqlite-20150417/SQLite/Database.java 2015-04-18 03:48:38.439184552 +0200
++++ javasqlite-20150417.java8doc/SQLite/Database.java 2015-04-18 03:56:10.096018966 +0200
+@@ -50,7 +50,7 @@
+ *
+ * @param filename the name of the database file
+ * @param mode open mode (e.g. SQLITE_OPEN_READONLY)
+- * @param vfs VFS name (for SQLite >= 3.5)
++ * @param vfs VFS name (for SQLite ≥ 3.5)
+ */
+
+ public void open(String filename, int mode, String vfs)
+@@ -79,7 +79,7 @@
+ *
+ * @param filename the name of the database file
+ * @param mode open mode (e.g. SQLITE_OPEN_READONLY)
+- * @param vfs VFS name (for SQLite >= 3.5)
++ * @param vfs VFS name (for SQLite ≥ 3.5)
+ * @param ver2 flag to force version on create (false = SQLite3, true = SQLite2)
+ */
+
+@@ -450,7 +450,7 @@
+
+ /**
+ * Return SQLite version number as string.
+- * If the database is not open, <tt>unknown</tt> is returned.
++ * If the database is not open, {@code unknown} is returned.
+ */
+
+ public native String dbversion();
diff --git a/javasqlite.spec b/javasqlite.spec
index 9e1c8cd..dcd7362 100644
--- a/javasqlite.spec
+++ b/javasqlite.spec
@@ -24,8 +24,8 @@
%global __provides_exclude_from ^%{_libdir}/%{name}/.*\.so$
Name: javasqlite
-Version: 20140624
-Release: 5%{?dist}
+Version: 20150417
+Release: 1%{?dist}
Summary: SQLite Java Wrapper/JDBC Driver
License: BSD
@@ -33,8 +33,8 @@ 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 2014-06-28
-Patch1: 0001-Make-buildable-with-Java-1.8.patch
+
+Patch1: %{name}-20150417-javadoc.patch
# >= 3.4 for zeroblob stuff in %%check's test3
BuildRequires: sqlite-devel >= 3.4
@@ -66,8 +66,7 @@ API documentation for %{name}.
%prep
%setup -q
sed -e 's|@JNIPATH@|%{_libdir}/%{name}|' %{PATCH0} | patch -p1 --fuzz=0
-%patch1 -p1 -b .java18
-for f in configure{,.in}; do touch -r $f.java18 $f; done
+%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
rm doc/stylesheet.css # overrides javadoc's defaults
@@ -119,10 +118,10 @@ make javadoc JAVADOCLINK=%{_javadocdir}/java
%install
-make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/libsqlite_jni.la
-install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pR doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+make install DESTDIR=%{buildroot}
+rm -f %{buildroot}%{_libdir}/%{name}/libsqlite_jni.la
+mkdir -p %{buildroot}%{_javadocdir}/%{name}
+cp -pR doc/* %{buildroot}%{_javadocdir}/%{name}
%check
@@ -147,6 +146,9 @@ done
%{_javadocdir}/%{name}
%changelog
+* Sat Apr 18 2015 gil cattaneo <puntogil at libero.it> 20150417-1
+- update to 20150417
+
* Sun Feb 22 2015 gil cattaneo <puntogil at libero.it> 20140624-5
- introduce license macro
diff --git a/sources b/sources
index 8fc7b28..f40f5b8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5f6a58981e83c72d7563b95c0b1e36a5 javasqlite-20140624.tar.gz
+4e1903f04a6419188888bb39d1167922 javasqlite-20150417.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/javasqlite.git/commit/?h=master&id=acc37400ae4f24dfced7718cf84d42b9b48e6e72
More information about the scm-commits
mailing list