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

Accepting request 124693 from Java:packages

Browse Source 
- Update to 1.8.1.3
  * adds support for fast closing of huge database files
  * better query optimisation. 
  * bugfixes
- add maven pom
- fix build with jdk7
- run su with -s /bin/sh in initscript

OBS-URL: https://build.opensuse.org/request/show/124693
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/hsqldb?expand=0&rev=12
This commit is contained in:
Stephan Kulow 2012-06-15 17:35:09 +00:00 committed by Git OBS Bridge
commit 6326ed1a97
9 changed files with 388 additions and 348 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

281
hsqldb-1.8.0.10-java6.patch
View File

@ -1,281 +0,0 @@
--- src/org/hsqldb/jdbc/jdbcBlob.java
+++ src/org/hsqldb/jdbc/jdbcBlob.java
@@ -461,8 +461,6 @@
data = newData;
}
-//#ifdef JAVA6
-/*
public void free() throws SQLException
{
throw new UnsupportedOperationException("Not supported yet.");
@@ -472,9 +470,6 @@
{
throw new UnsupportedOperationException("Not supported yet.");
}
-*/
-
-//#endif JAVA6
// public static void main(String[] args) throws Exception {
//
--- src/org/hsqldb/jdbc/jdbcCallableStatement.java
+++ src/org/hsqldb/jdbc/jdbcCallableStatement.java
@@ -36,13 +36,9 @@
import java.math.BigDecimal;
import java.sql.CallableStatement;
import java.sql.Date;
-//#ifdef JAVA6
-/*
import java.sql.NClob;
import java.sql.RowId;
import java.sql.SQLXML;
-*/
-//#endif JAVA6
import java.sql.Time;
import java.sql.Timestamp;
import java.sql.SQLException;
@@ -3105,8 +3101,7 @@
}
//#endif JAVA4
-//#ifdef JAVA6
-/*
+
public void setPoolable(boolean poolable) throws SQLException
{
throw new UnsupportedOperationException("Not supported yet.");
@@ -3376,7 +3371,4 @@
{
throw new UnsupportedOperationException("Not supported yet.");
}
-*/
-
-//#endif JAVA6
}
--- src/org/hsqldb/jdbc/jdbcClob.java
+++ src/org/hsqldb/jdbc/jdbcClob.java
@@ -463,8 +463,6 @@
}
}
-//#ifdef JAVA6
-/*
public void free() throws SQLException
{
throw new UnsupportedOperationException("Not supported yet.");
@@ -474,6 +472,4 @@
{
throw new UnsupportedOperationException("Not supported yet.");
}
-*/
-//#endif JAVA6
}
--- src/org/hsqldb/jdbc/jdbcConnection.java
+++ src/org/hsqldb/jdbc/jdbcConnection.java
@@ -42,14 +42,9 @@
import java.sql.Connection;
import java.sql.DatabaseMetaData;
-//#ifdef JAVA6
-/*
import java.sql.NClob;
import java.sql.SQLClientInfoException;
import java.sql.SQLXML;
-*/
-
-//#endif JAVA6
import java.sql.PreparedStatement;
import java.sql.SQLException;
import java.sql.SQLWarning;
@@ -2728,8 +2723,6 @@
return i;
}
-//#ifdef JAVA6
-/*
public Clob createClob() throws SQLException
{
throw new UnsupportedOperationException("Not supported yet.");
@@ -2794,7 +2787,4 @@
{
throw new UnsupportedOperationException("Not supported yet.");
}
-*/
-
-//#endif JAVA6
}
--- src/org/hsqldb/jdbc/jdbcDataSource.java
+++ src/org/hsqldb/jdbc/jdbcDataSource.java
@@ -311,8 +311,6 @@
this.user = user;
}
-//#ifdef JAVA6
-/*
public <T> T unwrap(Class<T> iface) throws SQLException
{
throw new UnsupportedOperationException("Not supported yet.");
@@ -322,7 +320,4 @@
{
throw new UnsupportedOperationException("Not supported yet.");
}
-*/
-
-//#endif JAVA6
}
--- src/org/hsqldb/jdbc/jdbcDatabaseMetaData.java
+++ src/org/hsqldb/jdbc/jdbcDatabaseMetaData.java
@@ -36,12 +36,7 @@
import java.sql.ResultSet;
import java.sql.SQLException;
-//#ifdef JAVA6
-/*
import java.sql.RowIdLifetime;
-*/
-
-//#endif JAVA6
import org.hsqldb.Column;
import org.hsqldb.Library;
import org.hsqldb.Trace;
@@ -5649,8 +5644,6 @@
return schemaName;
}
-//#ifdef JAVA6
-/*
public RowIdLifetime getRowIdLifetime() throws SQLException
{
throw new UnsupportedOperationException("Not supported yet.");
@@ -5694,7 +5687,4 @@
{
throw new UnsupportedOperationException("Not supported yet.");
}
-*/
-
-//#endif JAVA6
}
--- src/org/hsqldb/jdbc/jdbcParameterMetaData.java
+++ src/org/hsqldb/jdbc/jdbcParameterMetaData.java
@@ -382,8 +382,6 @@
return sb.toString();
}
-//#ifdef JAVA6
-/*
public <T> T unwrap(Class<T> iface) throws SQLException
{
throw new UnsupportedOperationException("Not supported yet.");
@@ -393,7 +391,4 @@
{
throw new UnsupportedOperationException("Not supported yet.");
}
-*/
-
-//#endif JAVA6
}
--- src/org/hsqldb/jdbc/jdbcPreparedStatement.java
+++ src/org/hsqldb/jdbc/jdbcPreparedStatement.java
@@ -38,14 +38,9 @@
import java.math.BigDecimal;
import java.sql.Date;
-//#ifdef JAVA6
-/*
import java.sql.NClob;
import java.sql.RowId;
import java.sql.SQLXML;
-*/
-
-//#endif JAVA6
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
@@ -2292,8 +2287,6 @@
return sb.toString();
}
-//#ifdef JAVA6
-/*
public void setPoolable(boolean poolable) throws SQLException
{
throw new UnsupportedOperationException("Not supported yet.");
@@ -2403,7 +2396,4 @@
{
throw new UnsupportedOperationException("Not supported yet.");
}
-*/
-
-//#endif JAVA6
}
--- src/org/hsqldb/jdbc/jdbcResultSet.java
+++ src/org/hsqldb/jdbc/jdbcResultSet.java
@@ -75,14 +75,10 @@
import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
-//#ifdef JAVA6
-/*
import java.sql.RowId;
import java.sql.NClob;
import java.sql.SQLXML;
-*/
-//#endif JAVA6
import java.sql.SQLException;
import java.sql.SQLWarning;
import java.sql.Statement;
@@ -5074,8 +5070,6 @@
: true;
}
-//#ifdef JAVA6
-/*
public RowId getRowId(int columnIndex) throws SQLException
{
throw new UnsupportedOperationException("Not supported yet.");
@@ -5325,7 +5319,4 @@
{
throw new UnsupportedOperationException("Not supported yet.");
}
-*/
-
-//#endif JAVA6
}
--- src/org/hsqldb/jdbc/jdbcResultSetMetaData.java
+++ src/org/hsqldb/jdbc/jdbcResultSetMetaData.java
@@ -1144,8 +1144,6 @@
String.valueOf(column));
}
}
-//#ifdef JAVA6
-/*
public <T> T unwrap(Class<T> iface) throws SQLException
{
throw new UnsupportedOperationException("Not supported yet.");
@@ -1155,6 +1153,4 @@
{
throw new UnsupportedOperationException("Not supported yet.");
}
-*/
-//#endif JAVA6
}
--- src/org/hsqldb/jdbc/jdbcStatement.java
+++ src/org/hsqldb/jdbc/jdbcStatement.java
@@ -1587,8 +1587,6 @@
throw Util.sqlException(e);
}
}
-//#ifdef JAVA6
-/*
public void setPoolable(boolean poolable) throws SQLException
{
throw new UnsupportedOperationException("Not supported yet.");
@@ -1608,6 +1606,4 @@
{
throw new UnsupportedOperationException("Not supported yet.");
}
-*/
-//#endif JAVA6
}

2
hsqldb-1.8.0.10-suse-initscript.patch
View File

@ -375,7 +375,7 @@ Index: bin/hsqldb
# N.b.!!! The shell of the -c command is the target user's default
# login shell, so keep this command shell-independent!
- nohup su "$HSQLDB_OWNER" -c "cd '$SERVER_HOME' && echo "'$$'" > '$PIDFILE' && exec '$JAVA_EXECUTABLE' $SERVER_JVMARGS $TLS_SWITCHES -classpath '${SERVER_ADDL_CLASSPATH}${HSQLDB_JAR_PATH}' org.hsqldb.util.MainInvoker org.hsqldb.$TARGET_CLASS $INVOC_ADDL_ARGS" >> "$LOGFILE" 2>&1 &
+ /usr/bin/nohup $SU "$HSQLDB_OWNER" -c "cd '$SERVER_HOME' && echo "'$$'" > '$PIDFILE' && exec '$JAVA_EXECUTABLE' $SERVER_JVMARGS $TLS_SWITCHES -classpath '${SERVER_ADDL_CLASSPATH}${HSQLDB_JAR_PATH}' org.hsqldb.util.MainInvoker org.hsqldb.$TARGET_CLASS $INVOC_ADDL_ARGS" >> "$LOGFILE" 2>&1 &
+ /usr/bin/nohup $SU "$HSQLDB_OWNER" -s /bin/sh -c "cd '$SERVER_HOME' && echo "'$$'" > '$PIDFILE' && exec '$JAVA_EXECUTABLE' $SERVER_JVMARGS $TLS_SWITCHES -classpath '${SERVER_ADDL_CLASSPATH}${HSQLDB_JAR_PATH}' org.hsqldb.util.MainInvoker org.hsqldb.$TARGET_CLASS $INVOC_ADDL_ARGS" >> "$LOGFILE" 2>&1 &
else
cd "$SERVER_HOME" || {
echo "Failed to cd to '$SERVER_HOME'" 1>&2

22
hsqldb-1.8.0.10.pom Normal file
View File

@ -0,0 +1,22 @@
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<packaging>jar</packaging>
<name>HSQLDB</name>
<version>1.8.0.10</version>
<url>http://hsqldb.org/</url>
<description>Lightweight 100% Java SQL Database Engine</description>
<licenses>
<license>
<name>HSQLDB License</name>
<url>http://hsqldb.org/web/hsqlLicense.html</url>
<distribution>repo</distribution>
</license>
</licenses>
<scm>
<url>http://sourceforge.net/cvs/?group_id=23316</url>
</scm>
<dependencies>
</dependencies>
</project>

3
hsqldb-1.8.0.10.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:54cd289ab0839146b2c833b7d5e9c79f3f8c63e4bd63f79c94555326d4a652ea
size 2536458

15
hsqldb-component-info.xml
View File

@ -1,15 +0,0 @@
<project name="hsqldb-component-info">
<component id="hsqldb"
version="@VERSION@"
licenseType="hsqldb"
projectHome="http://hsqldb.org/"
description="Java relational database engine supporting a subset of ANSI-92 SQL plus SQL 99 and 2003 enhancements (with fix for CVE-2007-4576)"
scm=":ext:cvs.devel.redhat.com:/cvs/dist/hsqldb"
tag="@TAG@">
<!-- Built using JDK 1.4 -->
<artifact id="hsqldb.jar"/>
<export>
<include input="hsqldb.jar"/>
</export>
</component>
</project>

293
hsqldb-jdbc-4.1.patch Normal file
View File

@ -0,0 +1,293 @@
diff -ur hsqldb.orig/build/build.xml hsqldb/build/build.xml
--- hsqldb.orig/build/build.xml 2010-06-23 08:49:15.000000000 -0400
+++ hsqldb/build/build.xml 2012-01-24 15:09:43.000000000 -0500
@@ -98,7 +98,11 @@
<echo message="ant.java.hasjsse=${ant.java.hasjsse}" />
</target>
- <target name="javaversion6">
+ <target name="javaversion7">
+ <available classname="java.util.Objects" property="ant.java.iscjava17"/>
+ </target>
+
+ <target name="javaversion6" depends="javaversion7" unless="ant.java.iscjava17">
<available classname="java.net.IDN" property="ant.java.iscjava16"/>
</target>
@@ -210,6 +214,7 @@
<arg value="+JAVA2FULL"/>
<arg value="-JAVA4"/>
<arg value="-JAVA6"/>
+ <arg value="-JAVA7"/>
</java>
</target>
@@ -244,6 +249,7 @@
<arg value="+JAVA2FULL"/>
<arg value="+JAVA4"/>
<arg value="-JAVA6"/>
+ <arg value="-JAVA7"/>
</java>
</target>
@@ -279,10 +285,47 @@
<arg value="+JAVA2FULL"/>
<arg value="+JAVA4"/>
<arg value="+JAVA6"/>
+ <arg value="-JAVA7"/>
+ </java>
+ </target>
+
+ <target name="switchtojdk17" depends="switchtojdk16"
+ description="self explanatory" if="ant.java.iscjava17">
+ <java classname="org.hsqldb.util.CodeSwitcher" classpath="classes" >
+ <arg file="${src}/org/hsqldb/lib/java/JavaSystem.java"/>
+ <arg file="${src}/org/hsqldb/lib/HsqlTimer.java"/>
+ <arg file="${src}/org/hsqldb/jdbcDriver.java"/>
+ <arg file="${src}/org/hsqldb/jdbc/jdbcBlob.java"/>
+ <arg file="${src}/org/hsqldb/jdbc/jdbcDatabaseMetaData.java"/>
+ <arg file="${src}/org/hsqldb/jdbc/jdbcDataSource.java"/>
+ <arg file="${src}/org/hsqldb/jdbc/jdbcCallableStatement.java"/>
+ <arg file="${src}/org/hsqldb/jdbc/jdbcClob.java"/>
+ <arg file="${src}/org/hsqldb/jdbc/jdbcConnection.java"/>
+ <arg file="${src}/org/hsqldb/jdbc/jdbcParameterMetaData.java"/>
+ <arg file="${src}/org/hsqldb/jdbc/jdbcPreparedStatement.java"/>
+ <arg file="${src}/org/hsqldb/jdbc/jdbcResultSet.java"/>
+ <arg file="${src}/org/hsqldb/jdbc/jdbcResultSetMetaData.java"/>
+ <arg file="${src}/org/hsqldb/jdbc/jdbcStatement.java"/>
+ <arg file="${src}/org/hsqldb/persist/LockFile.java"/>
+ <arg file="${src}/org/hsqldb/persist/Logger.java"/>
+ <arg file="${src}/org/hsqldb/persist/ScaledRAFile.java"/>
+ <arg file="${src}/org/hsqldb/rowio/RowInputTextLog.java"/>
+ <arg file="${src}/org/hsqldb/util/DatabaseManager.java"/>
+ <arg file="${src}/org/hsqldb/util/ConnectionDialogCommon.java"/>
+ <arg file="${src}/org/hsqldb/lib/SimpleLog.java"/>
+ <arg file="${src}/org/hsqldb/rowio/RowInputTextLog.java"/>
+ <arg file="${src}/org/hsqldb/lib/SimpleLog.java"/>
+ <arg file="${src}/org/hsqldb/rowio/RowInputTextLog.java"/>
+ <arg file="${src}/org/hsqldb/HsqlDateTime.java"/>
+ <arg value="+JAVA2"/>
+ <arg value="+JAVA2FULL"/>
+ <arg value="+JAVA4"/>
+ <arg value="+JAVA6"/>
+ <arg value="+JAVA7"/>
</java>
</target>
- <target name="store" depends="switchtojdk16"
+ <target name="store" depends="switchtojdk17"
description="compiles the /store folder">
<javac srcdir="${src}"
destdir="classes"
diff -ur hsqldb.orig/src/org/hsqldb/jdbc/jdbcCallableStatement.java hsqldb/src/org/hsqldb/jdbc/jdbcCallableStatement.java
--- hsqldb.orig/src/org/hsqldb/jdbc/jdbcCallableStatement.java 2010-02-27 12:04:52.000000000 -0500
+++ hsqldb/src/org/hsqldb/jdbc/jdbcCallableStatement.java 2012-01-24 15:00:15.000000000 -0500
@@ -3379,4 +3379,20 @@
*/
//#endif JAVA6
+
+//#ifdef JAVA7
+/*
+ public <T> T getObject(String columnLabel, Class<T> type) throws SQLException
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ public <T> T getObject(int ColumnIndex, Class<T> type) throws SQLException
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+*/
+
+//#endif JAVA7
}
diff -ur hsqldb.orig/src/org/hsqldb/jdbc/jdbcConnection.java hsqldb/src/org/hsqldb/jdbc/jdbcConnection.java
--- hsqldb.orig/src/org/hsqldb/jdbc/jdbcConnection.java 2010-02-27 12:04:52.000000000 -0500
+++ hsqldb/src/org/hsqldb/jdbc/jdbcConnection.java 2012-01-24 14:53:02.000000000 -0500
@@ -50,6 +50,14 @@
*/
//#endif JAVA6
+
+//#ifdef JAVA7
+/*
+import java.util.concurrent.Executor;
+*/
+
+//#endif JAVA7
+
import java.sql.PreparedStatement;
import java.sql.SQLException;
import java.sql.SQLWarning;
@@ -2794,4 +2802,33 @@
*/
//#endif JAVA6
+
+//#ifdef JAVA7
+/*
+ public int getNetworkTimeout() throws SQLException
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ public void setNetworkTimeout(Executor executor, int millis) throws SQLException
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ public void abort(Executor executor) throws SQLException
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ public String getSchema() throws SQLException
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ public void setSchema(String schema) throws SQLException
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+*/
+//#endif JAVA7
}
diff -ur hsqldb.orig/src/org/hsqldb/jdbc/jdbcDatabaseMetaData.java hsqldb/src/org/hsqldb/jdbc/jdbcDatabaseMetaData.java
--- hsqldb.orig/src/org/hsqldb/jdbc/jdbcDatabaseMetaData.java 2010-02-27 12:04:52.000000000 -0500
+++ hsqldb/src/org/hsqldb/jdbc/jdbcDatabaseMetaData.java 2012-01-24 15:03:07.000000000 -0500
@@ -5697,4 +5697,21 @@
*/
//#endif JAVA6
+
+//#ifdef JAVA7
+/*
+ public boolean generatedKeyAlwaysReturned() throws SQLException
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ public ResultSet getPseudoColumns(String catalog, String schemaPattern,
+ String tableNamePattern, String columnNamePattern) throws SQLException
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+*/
+
+//#endif JAVA7
}
diff -ur hsqldb.orig/src/org/hsqldb/jdbc/jdbcDataSource.java hsqldb/src/org/hsqldb/jdbc/jdbcDataSource.java
--- hsqldb.orig/src/org/hsqldb/jdbc/jdbcDataSource.java 2010-02-27 12:04:52.000000000 -0500
+++ hsqldb/src/org/hsqldb/jdbc/jdbcDataSource.java 2012-01-24 15:08:29.000000000 -0500
@@ -47,6 +47,13 @@
//#endif JAVA4
import org.hsqldb.jdbcDriver;
+//#ifdef JAVA7
+/*
+import java.sql.SQLFeatureNotSupportedException;
+import java.util.logging.Logger;
+*/
+//#endif JAVA7
+
// boucherb@users 20040411 - doc 1.7.2 - javadoc updates toward 1.7.2 final
/**
@@ -325,4 +332,14 @@
*/
//#endif JAVA6
+
+//#ifdef JAVA7
+/*
+ public Logger getParentLogger() throws SQLFeatureNotSupportedException
+ {
+ throw new SQLFeatureNotSupportedException("Not supported yet.");
+ }
+*/
+
+//#endif JAVA7
}
diff -ur hsqldb.orig/src/org/hsqldb/jdbc/jdbcResultSet.java hsqldb/src/org/hsqldb/jdbc/jdbcResultSet.java
--- hsqldb.orig/src/org/hsqldb/jdbc/jdbcResultSet.java 2010-06-23 08:49:19.000000000 -0400
+++ hsqldb/src/org/hsqldb/jdbc/jdbcResultSet.java 2012-01-24 14:55:16.000000000 -0500
@@ -5332,4 +5332,21 @@
*/
//#endif JAVA6
+
+
+//#ifdef JAVA7
+/*
+
+ public <T> T getObject(String columnLabel, Class<T> type) throws SQLException
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ public <T> T getObject(int columnNum, Class<T> type) throws SQLException
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+*/
+
+//#endif JAVA6
}
diff -ur hsqldb.orig/src/org/hsqldb/jdbc/jdbcStatement.java hsqldb/src/org/hsqldb/jdbc/jdbcStatement.java
--- hsqldb.orig/src/org/hsqldb/jdbc/jdbcStatement.java 2010-02-27 12:04:52.000000000 -0500
+++ hsqldb/src/org/hsqldb/jdbc/jdbcStatement.java 2012-01-24 14:58:14.000000000 -0500
@@ -1610,4 +1610,18 @@
}
*/
//#endif JAVA6
+
+//#ifdef JAVA7
+/*
+ public boolean isCloseOnCompletion() throws SQLException
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ public void closeOnCompletion() throws SQLException
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+*/
+//#endif JAVA7
}
diff -ur hsqldb.orig/src/org/hsqldb/jdbcDriver.java hsqldb/src/org/hsqldb/jdbcDriver.java
--- hsqldb.orig/src/org/hsqldb/jdbcDriver.java 2009-02-16 19:29:55.000000000 -0500
+++ hsqldb/src/org/hsqldb/jdbcDriver.java 2012-01-24 15:08:44.000000000 -0500
@@ -42,6 +42,13 @@
import org.hsqldb.persist.HsqlDatabaseProperties;
import org.hsqldb.persist.HsqlProperties;
+//#ifdef JAVA7
+/*
+import java.sql.SQLFeatureNotSupportedException;
+import java.util.logging.Logger;
+*/
+//#endif JAVA7
+
// fredt@users 20011220 - patch 1.7.0 by fredt
// new version numbering scheme
// fredt@users 20020320 - patch 1.7.0 - JDBC 2 support and error trapping
@@ -321,4 +328,14 @@
DriverManager.registerDriver(new jdbcDriver());
} catch (Exception e) {}
}
+
+//#ifdef JAVA7
+/*
+ public Logger getParentLogger() throws SQLFeatureNotSupportedException
+ {
+ throw new SQLFeatureNotSupportedException("Not supported yet.");
+ }
+*/
+
+//#endif JAVA7
}

11
hsqldb.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Mon May 21 12:19:01 UTC 2012 - mvyskocil@suse.cz
- Update to 1.8.1.3
* adds support for fast closing of huge database files
* better query optimisation.
* bugfixes
- add maven pom
- fix build with jdk7
- run su with -s /bin/sh in initscript
-------------------------------------------------------------------
Mon Dec 19 13:22:15 CET 2011 - dmueller@suse.de

106
hsqldb.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package hsqldb
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -15,43 +15,39 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
%define reltag patch01
Name: hsqldb
Version: 1.8.0.10
Version: 1.8.1.13
Release: 0
Summary: Hsqldb Database Engine
Summary: HYperSQL Database Engine
License: BSD-3-Clause
Group: Development/Libraries/Java
Url: http://hsqldb.sourceforge.net/
# http://downloads.sourceforge.net/hsqldb/hsqldb_1_8_0_10.zip
# unzip -q hsqldb_1_8_0_10.zip
# tar -cjf hsqldb-%{version}.tar.bz2 hsqldb/
Source0: %{name}-%{version}.tar.bz2
Source0: %{name}_1_8_1_3.zip
Source1: %{name}-1.8.0-standard.cfg
Source2: %{name}-1.8.0-standard-server.properties
Source3: %{name}-1.8.0-standard-webserver.properties
Source4: %{name}-1.8.0-standard-sqltool.rc
Source5: hsqldb-component-info.xml
Source5: %{name}-1.8.0.10.pom
Patch0: %{name}-1.8.0-scripts.patch
Patch1: hsqldb-tmp.patch
# Obsoleted by 1.8.0.10
#Patch2: hsqldb-1.8.0.8-backport.patch
Patch3: hsqldb-1.8.0.10-java6.patch
Patch3: hsqldb-jdbc-4.1.patch
Patch1000: hsqldb-1.8.0.10-suse-initscript.patch
PreReq: servletapi5
PreReq: pwdutils
Requires(post): /bin/rm,/bin/ln
Requires(preun):/bin/rm
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
Requires: java
Requires: servletapi5
BuildRequires: ant
BuildRequires: fdupes
BuildRequires: jpackage-utils >= 1.5
BuildRequires: junit
BuildRequires: servletapi5
BuildRequires: unzip
PreReq: %fillup_prereq
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
HSQLdb is a relational database engine written in JavaTM , with a JDBC
@ -76,6 +72,7 @@ restrictions!
%package manual
Summary: Hsqldb Database Engine
Group: Development/Libraries/Java
%description manual
HSQLdb is a relational database engine written in JavaTM , with a JDBC
@ -100,6 +97,7 @@ restrictions!
%package javadoc
Summary: Hsqldb Database Engine
Group: Development/Libraries/Java
%description javadoc
HSQLdb is a relational database engine written in JavaTM , with a JDBC
@ -124,6 +122,7 @@ restrictions!
%package demo
Summary: Hsqldb Database Engine
Group: Development/Libraries/Java
Requires: %{name} = %{version}
%description demo
@ -148,82 +147,101 @@ restrictions!
%prep
%setup -q -n %{name}
perl -pi -e 's/\r$//g' doc/*.txt doc/src/hsqldbstylesheet.css
%setup -T -c -n %{name}
(cd ..; unzip -q %{SOURCE0})
# set right permissions
find . -name "*.sh" -exec chmod 755 \{\} \;
# remove all _notes directories
for dir in `find . -name _notes`; do rm -rf $dir; done
# remove all binary libs
find . -name "*.jar" -exec rm -f {} \;
find . -name "*.class" -exec rm -f {} \;
find . -name "*.war" -exec rm -f {} \;
# correct silly permissions
chmod -R go=u-w *
%patch0 -p0
%patch1 -p1
if [[ $(readlink -f ${JAVA_HOME} | grep '1\.6\.0') ]]; then
%patch3 -b .java6-compatibility
fi
%patch3 -p1
%patch1000 -b .suse-initscript
cp %{SOURCE5} pom.xml
%build
export CLASSPATH=$(build-classpath \
jsse/jsse \
jsse/jnet \
jsse/jcert \
jdbc-stdext \
servletapi5 \
junit)
export OPT_JAR_LIST=:
pushd build
ant -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 jar javadoc
ant jar javadoc
popd
%install
# jar
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
install -m 644 lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} ${jar/-%{version}/}; done)
install -m 644 lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
# bin
install -d -m 755 $RPM_BUILD_ROOT%{_bindir}
install -m 755 bin/runUtil.sh $RPM_BUILD_ROOT%{_bindir}/%{name}RunUtil
# sysv init
install -d -m 755 $RPM_BUILD_ROOT%{_initrddir}
install -m 755 bin/%{name} $RPM_BUILD_ROOT%{_initrddir}/%{name}
# rchsqldb link
install -d -m 0755 $RPM_BUILD_ROOT/%{_sbindir}/
ln -sf %{_sysconfdir}/init.d/%{name} $RPM_BUILD_ROOT/%{_sbindir}/rc%{name}
# sysconfig
#install -d -m 0755 $RPM_BUILD_ROOT/var/adm/fillup-templates
#install -m 700 %{SOURCE1} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.%{name}
install -m 0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/%{name}.conf
# serverconfig
install -d -m 755 $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}
install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/server.properties
install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/webserver.properties
install -m 600 %{SOURCE4} $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/sqltool.rc
# lib
install -d -m 755 $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/lib
install -m 644 lib/functions $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/lib
# data
install -d -m 755 $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/data
# demo
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/demo
install -m 755 demo/*.sh $RPM_BUILD_ROOT%{_datadir}/%{name}/demo
install -m 644 demo/*.html $RPM_BUILD_ROOT%{_datadir}/%{name}/demo
# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -r doc/src/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
# FIXME: (dwalluck): breaks --short-circuit
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -r doc/src/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
rm -rf doc/src
# manual
install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
cp -pr doc/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
cp -p index.html $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
%fdupes -s %{buildroot}
# Maven metadata
install -pD -T -m 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
%add_to_maven_depmap %{name} %{name} %{version} JPP %{name}
pushd $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/lib
# build-classpath can not be used as the jar is not
# yet present during the build
ln -s %{_javadir}/hsqldb.jar hsqldb.jar
ln -s $(build-classpath servletapi5) servletapi5.jar
popd
%clean
rm -rf $RPM_BUILD_ROOT
@ -246,22 +264,12 @@ fi
%{fillup_and_insserv %{name}}
rm -f %{_localstatedir}/lib/%{name}/lib/hsqldb.jar
rm -f %{_localstatedir}/lib/%{name}/lib/servlet.jar
(cd %{_localstatedir}/lib/%{name}/lib
ln -s $(build-classpath hsqldb) hsqldb.jar
ln -s $(build-classpath servletapi5) servlet.jar
) 2>/dev/null || :
%postun
%restart_on_update %{name}
%insserv_cleanup
%preun
if [ "$1" = "0" ]; then
rm -f %{_localstatedir}/lib/%{name}/lib/hsqldb.jar
rm -f %{_localstatedir}/lib/%{name}/lib/servlet.jar
#%{_sbindir}/userdel %{name} >> /dev/null 2>&1 || :
#%{_sbindir}/groupdel %{name} >> /dev/null 2>&1 || :
fi
%stop_on_removal %{name}
%files
@ -272,13 +280,16 @@ fi
%attr(0755,root,root) %{_bindir}/*
%attr(0755,root,root) %{_sbindir}/rc%{name}
%attr(0755,root,root) %{_initrddir}/%{name}
%attr(0755,hsqldb,hsqldb) %{_localstatedir}/lib/%{name}/data
%attr(0700,hsqldb,hsqldb) %{_localstatedir}/lib/%{name}/data
%{_localstatedir}/lib/%{name}/lib
%attr(0644,root,root) %{_localstatedir}/lib/%{name}/server.properties
%attr(0644,root,root) %{_localstatedir}/lib/%{name}/webserver.properties
%attr(0600,hsqldb,hsqldb) %{_localstatedir}/lib/%{name}/sqltool.rc
%dir %{_localstatedir}/lib/%{name}
%config %{_sysconfdir}/%{name}.conf
%config(noreplace) %{_sysconfdir}/%{name}.conf
%dir %{_mavenpomdir}
%{_mavenpomdir}/JPP-%{name}.pom
%{_mavendepmapfragdir}/%{name}
%files manual
%defattr(0644,root,root,0755)
@ -287,7 +298,6 @@ fi
%files javadoc
%defattr(0644,root,root,0755)
%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}
%files demo

3
hsqldb_1_8_1_3.zip Normal file
View File

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