From 77f0419fe818bce53faeea3dcdea0423df3da776 Mon Sep 17 00:00:00 2001 From: gil Date: Apr 19 2015 20:50:02 +0000 Subject: update to 20150419 --- diff --git a/javasqlite-20150417-javadoc.patch b/javasqlite-20150417-javadoc.patch deleted file mode 100644 index 3e5f3bb..0000000 --- a/javasqlite-20150417-javadoc.patch +++ /dev/null @@ -1,30 +0,0 @@ -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, unknown 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 dcd7362..7ca739d 100644 --- a/javasqlite.spec +++ b/javasqlite.spec @@ -24,7 +24,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*\.so$ Name: javasqlite -Version: 20150417 +Version: 20150419 Release: 1%{?dist} Summary: SQLite Java Wrapper/JDBC Driver @@ -34,8 +34,6 @@ Source0: http://www.ch-werner.de/javasqlite/%{name}-%{version}.tar.gz # Fedora specific, no need to send upstream. Patch0: %{name}-20090430-jnipath.patch -Patch1: %{name}-20150417-javadoc.patch - # >= 3.4 for zeroblob stuff in %%check's test3 BuildRequires: sqlite-devel >= 3.4 %if 0%{?javaver:1} @@ -66,7 +64,7 @@ API documentation for %{name}. %prep %setup -q sed -e 's|@JNIPATH@|%{_libdir}/%{name}|' %{PATCH0} | patch -p1 --fuzz=0 -%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 @@ -120,7 +118,7 @@ make javadoc JAVADOCLINK=%{_javadocdir}/java make install DESTDIR=%{buildroot} rm -f %{buildroot}%{_libdir}/%{name}/libsqlite_jni.la -mkdir -p %{buildroot}%{_javadocdir}/%{name} +install -dm 755 %{buildroot}%{_javadocdir}/%{name} cp -pR doc/* %{buildroot}%{_javadocdir}/%{name} @@ -146,6 +144,9 @@ done %{_javadocdir}/%{name} %changelog +* Sun Apr 19 2015 gil cattaneo 20150419-1 +- update to 20150419 + * Sat Apr 18 2015 gil cattaneo 20150417-1 - update to 20150417 diff --git a/sources b/sources index f40f5b8..f8cb688 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4e1903f04a6419188888bb39d1167922 javasqlite-20150417.tar.gz +242e384c1cd863d6996a35cf8c1c1e97 javasqlite-20150419.tar.gz