pool/hsqldb
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 962309 from Java:packages

Browse Source 
2.6.1

OBS-URL: https://build.opensuse.org/request/show/962309
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/hsqldb?expand=0&rev=30
This commit is contained in:
Dominique Leuenberger 2022-03-28 14:58:50 +00:00 committed by Git OBS Bridge
commit 4a3abd8a82
9 changed files with 56 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
hsqldb-2.4.1-javadoc10.patch
View File

@ -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 @@
</jar>
</target>
- <target name="-doclink-18"
- if="ant.java.iscjava18">
- <!-- TODO: update to final release api docs url when available -->
- <property name="jse.doc.link"
- value="http://docs.oracle.com/javase/8/docs/api/"/>
- <property name="jee.doc.link"
- value="http://docs.oracle.com/javaee/7/api/"/>
- </target>
-
- <target name="-doclink-16"
- depends="-doclink-18"
- if="ant.java.iscjava16"
- unless="ant.java.iscjava18">
- <property name="jse.doc.link"
- value="http://docs.oracle.com/javase/6/docs/api/"/>
- <property name="jee.doc.link"
- value="http://docs.oracle.com/javaee/6/api/"/>
- </target>
-
- <target name="-doclink-15"
- depends="-doclink-16"
- if="ant.java.iscjava15"
- unless="ant.java.iscjava16">
- <property name="jse.doc.link"
- value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
- <property name="jee.doc.link"
- value="http://docs.oracle.com/javaee/5/api/"/>
- </target>
-
- <target name="javadoc" depends="-prepare-javadoc,-set-jvmvars,-doclink-15"
+ <target name="javadoc" depends="-prepare-javadoc,-set-jvmvars"
description="Create javadoc for the distribution package">
<!-- TODO: Find out why JDBCDriver class is listed twice in the lass
list pane, but only when All Classes selected
@@ -953,8 +924,6 @@
<packageset dir='src'>
<include name='org/hsqldb/jdbc'/>
</packageset>
- <link href="${jse.doc.link}"/>
- <link href="${jee.doc.link}"/>
<tag name="todo" enabled="false"/>
<tag name="revised" enabled="false"/>
<tag name="jboss.xmbean" enabled="false"/>
@@ -968,7 +937,7 @@
</target>
<target name="javadocdev"
- depends="-prepare-javadoc,-set-jvmvars,-doclink-15"
+ depends="-prepare-javadoc,-set-jvmvars"
description="Create javadoc for all HSQLDB code-base classes">
<!-- Since our preprocessor package compilatoin depends on the
env-specific ant runtime lib via includeAntRuntime=true, Javadoc
@@ -998,9 +967,6 @@
<pathelement location="${junit38.lib}"/>
<pathelement location="${servletapi.lib}"/>
</classpath>
- <link href="${jse.doc.link}"/>
- <link href="${jee.doc.link}"/>
- <link href="${junit.doc.link}"/>
<tag name="todo"/>
<tag name="revised"/>
<tag name="jboss.xmbean"/>
Only in hsqldb-2.4.1/hsqldb/build: build.xml.orig
Only in hsqldb-2.4.1/hsqldb/build: build.xml.rej

3
hsqldb-2.4.1.zip
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:467ff38b073d1d05c78aa992c8bcd57d80740e6a9c449a08b745aa5f06a09bfc
size 7979027

6
hsqldb-2.4.1.pom → hsqldb-2.6.1.pom
View File

@ -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>

3
hsqldb-2.6.1.zip Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:722c721308c4b7af143a8b5dd53709372554c53443c785f27f2620f64ea446d4
size 11078491

30
hsqldb-apidocs.patch
View File

@ -2,19 +2,27 @@ diff --git a/build/build.xml b/build/build.xml
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"

21
hsqldb-cmdline.patch
View File

@ -1,21 +0,0 @@
diff --git a/build/build.xml b/build/build.xml
index ae8b37b..f3453fd 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -493,7 +493,7 @@ examples:
</target>
<!-- compiles the cmdline classes -->
- <target name="-cmdline" if="ant.java.iscjava15"
+ <target name="-cmdline"
depends="-prepare, -update-switch-branch,
-conditionalize-sqlfile-scanner, -sqlfile-scanner">
<javac srcdir="${swsrc}"
@@ -700,7 +700,6 @@ examples:
<exclude name="org/hsqldb/util/Zaurus*"/>
<exclude name="org/hsqldb/test/*.class"/>
<exclude name="org/hsqldb/sample/*.class"/>
- <exclude name="org/hsqldb/cmdline/**"/>
</jar>
</target>

11
hsqldb-mdescriptor.patch Normal file
View File

@ -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 @@
<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}"

16
hsqldb.changes
View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Thu Mar 17 05:53:55 UTC 2022 - Fridrich Strba <fstrba@suse.com>
- 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 <jsegitz@suse.com>

12
hsqldb.spec
View File

@ -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