diff --git a/hsqldb-2.3.2.zip b/hsqldb-2.3.2.zip
deleted file mode 100644
index b25f266..0000000
--- a/hsqldb-2.3.2.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:573082ab3f1c8f02c1f496b9aae15b74f1b5aedf3812ef300e90ead3047e5fb0
-size 7734168
diff --git a/hsqldb-2.3.2.pom b/hsqldb-2.3.3.pom
similarity index 82%
rename from hsqldb-2.3.2.pom
rename to hsqldb-2.3.3.pom
index c2e9724..76c39c3 100644
--- a/hsqldb-2.3.2.pom
+++ b/hsqldb-2.3.3.pom
@@ -4,7 +4,7 @@
4.0.0
org.hsqldb
hsqldb
- 2.3.2
+ 2.3.3
HyperSQL Database
HSQLDB - Lightweight 100% Java SQL Database Engine
http://hsqldb.org
@@ -28,8 +28,8 @@
- scm:svn:http://hsqldb.svn.sourceforge.net/svnroot/hsqldb/base
- 2.3.2
- http://hsqldb.svn.sourceforge.net/viewvc/hsqldb/base/tags/2.3.2
+ scm:svn:http://svn.code.sf.net/p/hsqldb/svn/base/
+ 2.3.3
+ http://sourceforge.net/p/hsqldb/svn/HEAD/tree/base/tags/2.3.3
diff --git a/hsqldb-2.3.3.zip b/hsqldb-2.3.3.zip
new file mode 100644
index 0000000..92f1b20
--- /dev/null
+++ b/hsqldb-2.3.3.zip
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b9a84c79a62fd0ca4af126f49aed8a6d21440f1007f1e13e8cfeb8a67dbd473e
+size 7768831
diff --git a/hsqldb-apidocs.patch b/hsqldb-apidocs.patch
index 1b19c59..17957ff 100644
--- a/hsqldb-apidocs.patch
+++ b/hsqldb-apidocs.patch
@@ -1,8 +1,8 @@
diff --git a/build/build.xml b/build/build.xml
-index 3a2b77f..c18fda0 100644
+index 9c46389..c523220 100644
--- a/build/build.xml
+++ b/build/build.xml
-@@ -130,6 +130,7 @@ examples:
+@@ -128,6 +128,7 @@ examples:
There is no performance penalty, since the javadoc task regenerates
everything each run.
-->
@@ -10,3 +10,12 @@ index 3a2b77f..c18fda0 100644
+@@ -974,7 +975,7 @@ examples:
+ src/org/hsqldb/auth/LdapAuthBean.java,
+ src/org/hsqldb/auth/LdapAuthBeanTester.java"
+ destdir="doc/apidocs"
+- stylesheetfile="doc/apidocs/javadoc.css"
++ additionalparam="-Xdoclint:none"
+ docencoding="UTF-8"
+ charset="UTF-8"
+ author="true"
diff --git a/hsqldb.changes b/hsqldb.changes
index b7aaa6d..de75140 100644
--- a/hsqldb.changes
+++ b/hsqldb.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Jul 29 11:17:12 UTC 2015 - tchvatal@suse.com
+
+- Version bump to 2.3.3:
+ * Various serveral minor issues
+ * No obvious detailed changelog
+- Fix build with jdk8 by tweaking doclint:
+ * hsqldb-apidocs.patch
+
-------------------------------------------------------------------
Wed Mar 18 09:46:07 UTC 2015 - tchvatal@suse.com
diff --git a/hsqldb.spec b/hsqldb.spec
index 4abaa42..053a548 100644
--- a/hsqldb.spec
+++ b/hsqldb.spec
@@ -17,7 +17,7 @@
Name: hsqldb
-Version: 2.3.2
+Version: 2.3.3
Release: 0
Summary: HyperSQL Database Engine
License: BSD-3-Clause
@@ -28,29 +28,17 @@ Source1: hsqldb-1.8.0-standard.cfg
Source2: hsqldb-1.8.0-standard-server.properties
Source3: hsqldb-1.8.0-standard-webserver.properties
Source4: hsqldb-1.8.0-standard-sqltool.rc
-#Source5: http://www.hsqldb.org/repos/org/hsqldb/hsqldb/%{version}/hsqldb-%{version}.pom
-# The maven pom file related to 2.3.2 version is not yet released
-Source5: hsqldb-%{version}.pom
-
+Source5: http://www.hsqldb.org/repos/org/hsqldb/hsqldb/%{version}/hsqldb-%{version}.pom
# Custom systemd files - talking with upstream about incorporating them, see
# http://sourceforge.net/projects/hsqldb/forums/forum/73673/topic/5367103
Source6: hsqldb.systemd
Source7: hsqldb-wrapper
Source8: hsqldb-post
Source9: hsqldb-stop
-
# Javadoc fails to create since apidocs folder is deleted and not recreated
Patch0: %{name}-apidocs.patch
# Package org.hsqldb.cmdline was only compiled with java 1.5
Patch1: %{name}-cmdline.patch
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildArch: noarch
-
-Requires: java
-Requires: servletapi5
-%{systemd_requires}
-
BuildRequires: ant
BuildRequires: fdupes
BuildRequires: javapackages-tools
@@ -58,6 +46,11 @@ BuildRequires: junit
BuildRequires: servletapi5
BuildRequires: systemd
BuildRequires: unzip
+Requires: java
+Requires: servletapi5
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildArch: noarch
+%systemd_requires
%description
HSQLdb is a relational database engine written in JavaTM , with a JDBC
@@ -85,7 +78,6 @@ Group: Documentation/Other
%description manual
Manual for %{name}.
-
%package javadoc
Summary: Javadoc for %{name}
Group: Documentation/HTML
@@ -93,7 +85,6 @@ Group: Documentation/HTML
%description javadoc
Javadoc for %{name}.
-
%package demo
Summary: Demo for %{name}
Group: Development/Libraries/Java
@@ -121,14 +112,13 @@ chmod -R go=u-w *
# Fix doc location
sed -i -e 's/doc-src/doc/g' build/build.xml
+sed -i -e 's|doc/apidocs|%{_javadocdir}/%{name}|g' index.html
%patch0 -p1
%patch1 -p1
%build
-export CLASSPATH=$(build-classpath \
-servletapi5 \
-junit)
+export CLASSPATH=$(build-classpath servletapi5 junit)
pushd build
export JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8
@@ -142,15 +132,15 @@ install -m 644 lib/%{name}.jar %{buildroot}%{_javadir}/%{name}.jar
# systemd
install -d -m 755 %{buildroot}%{_unitdir}
-install -d -m 755 %{buildroot}%{_prefix}/lib/%{name}
+install -d -m 755 %{buildroot}%{_libexecdir}/%{name}
install -m 644 %{SOURCE6} %{buildroot}%{_unitdir}/%{name}.service
-install -m 755 %{SOURCE7} %{buildroot}%{_prefix}/lib/%{name}/%{name}-wrapper
-install -m 755 %{SOURCE8} %{buildroot}%{_prefix}/lib/%{name}/%{name}-post
-install -m 755 %{SOURCE9} %{buildroot}%{_prefix}/lib/%{name}/%{name}-stop
+install -m 755 %{SOURCE7} %{buildroot}%{_libexecdir}/%{name}/%{name}-wrapper
+install -m 755 %{SOURCE8} %{buildroot}%{_libexecdir}/%{name}/%{name}-post
+install -m 755 %{SOURCE9} %{buildroot}%{_libexecdir}/%{name}/%{name}-stop
# rchsqldb link
install -d -m 0755 %{buildroot}/%{_sbindir}/
-ln -sf ../../sbin/service %{buildroot}/%{_sbindir}/rc%{name}
+ln -sf service %{buildroot}/%{_sbindir}/rc%{name}
# sysconfig
#install -d -m 0755 %{buildroot}/var/adm/fillup-templates
@@ -231,10 +221,10 @@ fi
%{_javadir}/*
%{_sbindir}/rc%{name}
%{_unitdir}/%{name}.service
-%dir %{_prefix}/lib/%{name}/
-%attr(0755,root,root) %{_prefix}/lib/%{name}/%{name}-post
-%attr(0755,root,root) %{_prefix}/lib/%{name}/%{name}-stop
-%attr(0755,root,root) %{_prefix}/lib/%{name}/%{name}-wrapper
+%dir %{_libexecdir}/%{name}/
+%attr(0755,root,root) %{_libexecdir}/%{name}/%{name}-post
+%attr(0755,root,root) %{_libexecdir}/%{name}/%{name}-stop
+%attr(0755,root,root) %{_libexecdir}/%{name}/%{name}-wrapper
%{_localstatedir}/lib/%{name}/lib
%attr(0700,hsqldb,hsqldb) %{_localstatedir}/lib/%{name}/data
%attr(0644,root,root) %{_localstatedir}/lib/%{name}/server.properties