Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package hsqldb for openSUSE:Factory checked in at 2022-03-28 16:58:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hsqldb (Old) and /work/SRC/openSUSE:Factory/.hsqldb.new.1900 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hsqldb" Mon Mar 28 16:58:50 2022 rev:30 rq:962309 version:2.6.1 Changes: -------- --- /work/SRC/openSUSE:Factory/hsqldb/hsqldb.changes 2021-09-26 21:49:23.662828192 +0200 +++ /work/SRC/openSUSE:Factory/.hsqldb.new.1900/hsqldb.changes 2022-03-28 16:59:22.788873081 +0200 @@ -1,0 +2,16 @@ +Thu Mar 17 05:53:55 UTC 2022 - Fridrich Strba <[email protected]> + +- 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 + +------------------------------------------------------------------- Old: ---- hsqldb-2.4.1-javadoc10.patch hsqldb-2.4.1.pom hsqldb-2.4.1.zip hsqldb-cmdline.patch New: ---- hsqldb-2.6.1.pom hsqldb-2.6.1.zip hsqldb-mdescriptor.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hsqldb.spec ++++++ --- /var/tmp/diff_new_pack.8e8XiT/_old 2022-03-28 16:59:23.668874276 +0200 +++ /var/tmp/diff_new_pack.8e8XiT/_new 2022-03-28 16:59:23.676874287 +0200 @@ -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 @@ 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 @@ 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 @@ %patch0 -p1 %patch1 -p1 -%patch2 -p2 %patch3 -p2 %build ++++++ hsqldb-2.4.1.pom -> hsqldb-2.6.1.pom ++++++ --- /work/SRC/openSUSE:Factory/hsqldb/hsqldb-2.4.1.pom 2018-07-24 17:33:06.528116594 +0200 +++ /work/SRC/openSUSE:Factory/.hsqldb.new.1900/hsqldb-2.6.1.pom 2022-03-28 16:59:22.252872353 +0200 @@ -4,7 +4,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.hsqldb</groupId> <artifactId>hsqldb</artifactId> - <version>2.4.1</version> + <version>2.6.1</version> <name>HyperSQL Database</name> <description>HSQLDB - Lightweight 100% Java SQL Database Engine</description> <url>http://hsqldb.org</url> @@ -29,7 +29,7 @@ </developers> <scm> <connection>scm:svn:http://svn.code.sf.net/p/hsqldb/svn/base/</connection> - <tag>2.4.1</tag> - <url>http://sourceforge.net/p/hsqldb/svn/HEAD/tree/base/tags/2.4.1</url> + <tag>2.6.1</tag> + <url>http://sourceforge.net/p/hsqldb/svn/HEAD/tree/base/tags/2.6.1</url> </scm> </project> ++++++ hsqldb-apidocs.patch ++++++ --- /var/tmp/diff_new_pack.8e8XiT/_old 2022-03-28 16:59:23.784874434 +0200 +++ /var/tmp/diff_new_pack.8e8XiT/_new 2022-03-28 16:59:23.788874439 +0200 @@ -2,20 +2,28 @@ index 9c46389..c523220 100644 --- a/build/build.xml +++ b/build/build.xml -@@ -128,6 +128,7 @@ examples: - There is no performance penalty, since the javadoc task regenerates - everything each run. - --> -+ <mkdir dir="doc/apidocs"/> - <copy todir="doc/apidocs"> - <!-- IMPORTANT: - Add a fixcrlf if we add non-binary files to doc/apidocs. --> -@@ -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. + --> ++ <mkdir dir="doc/apidocs"/> + <copy todir="doc/apidocs"> + <!-- IMPORTANT: + Add a fixcrlf if we add non-binary files to doc/apidocs. --> +@@ -804,7 +805,6 @@ + description="Create javadoc for the distribution package"> + <javadoc destdir="doc/apidocs" - stylesheetfile="doc/apidocs/javadoc.css" docencoding="UTF-8" charset="UTF-8" author="true" +@@ -852,7 +852,6 @@ + <javadoc + destdir="doc/apidocs" + docencoding="UTF-8" +- stylesheetfile="doc/apidocs/javadoc.css" + charset="UTF-8" + linksource="true" + author="true" ++++++ hsqldb-mdescriptor.patch ++++++ --- 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 @@ <mkdir dir='classes/modules/${module.name}'/> <javac srcdir="${swsrc}/modules/${module.name}" sourcepath="${swsrc}" + source="9" + target="9" includeantruntime="false" encoding="${javac.encoding}" destdir="classes/modules/${module.name}"
