diff --git a/hsqldb-2.4.1-javadoc10.patch b/hsqldb-2.4.1-javadoc10.patch
deleted file mode 100644
index 83ddaa9..0000000
--- a/hsqldb-2.4.1-javadoc10.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- hsqldb-2.4.1/hsqldb/build/build.xml 2018-01-02 16:19:00.000000000 +0100
-+++ hsqldb-2.4.1/hsqldb/build/build.xml 2018-07-11 08:35:42.354467810 +0200
-@@ -871,36 +871,7 @@
-
-
-
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
-
-+
-
-
-@@ -974,7 +975,6 @@ examples:
- src/org/hsqldb/auth/LdapAuthBean.java,
- src/org/hsqldb/auth/LdapAuthBeanTester.java"
+@@ -140,6 +140,7 @@
+ There is no performance penalty, since the javadoc task regenerates
+ everything each run.
+ -->
++
+
+
+@@ -804,7 +805,6 @@
+ description="Create javadoc for the distribution package">
+
-
-
--
-
-
-
--
-
-
-
diff --git a/hsqldb-mdescriptor.patch b/hsqldb-mdescriptor.patch
new file mode 100644
index 0000000..9b7de27
--- /dev/null
+++ b/hsqldb-mdescriptor.patch
@@ -0,0 +1,11 @@
+--- a/build/build.xml 2021-07-19 10:09:56.000000000 +0200
++++ b/build/build.xml 2022-03-17 06:44:51.105907875 +0100
+@@ -676,6 +676,8 @@
+
+
+
+- Upgrade to upsteam version 2.6.1
+- Modified patch:
+ * hsqldb-apidocs.patch
+ + adapt to changed context
+- Removed patches:
+ * hsqldb-2.4.1-javadoc10.patch
+ * hsqldb-cmdline.patch
+ + not needed with this version
+- Added patch:
+ * hsqldb-mdescriptor.patch
+ + module descriptor needs to be built with at least
+ source/target level 9
+
-------------------------------------------------------------------
Wed Sep 22 08:34:22 UTC 2021 - Johannes Segitz
diff --git a/hsqldb.spec b/hsqldb.spec
index b10c5d0..5632ff5 100644
--- a/hsqldb.spec
+++ b/hsqldb.spec
@@ -1,7 +1,7 @@
#
# spec file for package hsqldb
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -22,7 +22,7 @@
%endif
Name: hsqldb
-Version: 2.4.1
+Version: 2.6.1
Release: 0
Summary: HyperSQL Database Engine
License: BSD-3-Clause
@@ -33,7 +33,7 @@ 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
+Source5: https://repo1.maven.org/maven2/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
@@ -42,10 +42,7 @@ 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
-# Jdk10's javadoc ends up in error when a remote url cannot be reached
-Patch2: hsqldb-2.4.1-javadoc10.patch
+Patch1: %{name}-mdescriptor.patch
Patch3: harden_hsqldb.service.patch
BuildRequires: ant
BuildRequires: fdupes
@@ -129,7 +126,6 @@ sed -i -e 's|doc/apidocs|%{_javadocdir}/%{name}|g' index.html
%patch0 -p1
%patch1 -p1
-%patch2 -p2
%patch3 -p2
%build