Fri Aug 31 14:44:30 UTC 2007

Author: dbhole

Update of /cvs/extras/rpms/hsqldb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1507/devel

Modified Files:
	.cvsignore hsqldb.spec sources 
Added Files:
	hsqldb-1.8.0-scripts.patch 
	hsqldb-1.8.0-standard-server.properties 
	hsqldb-1.8.0-standard-sqltool.rc 
	hsqldb-1.8.0-standard-webserver.properties 
	hsqldb-1.8.0-standard.cfg 
Removed Files:
	hsqldb-1.8.0.7-scripts.patch 
	hsqldb-1.8.0.7-standard-server.properties 
	hsqldb-1.8.0.7-standard-sqltool.rc 
	hsqldb-1.8.0.7-standard-webserver.properties 
	hsqldb-1.8.0.7-standard.cfg 
Log Message:

Updating to 1.8 (package from fnasser)



hsqldb-1.8.0-scripts.patch:

--- NEW FILE hsqldb-1.8.0-scripts.patch ---
--- bin/runUtil.sh.orig	2004-08-10 16:04:01.000000000 +0200
+++ bin/runUtil.sh	2004-08-10 16:05:43.000000000 +0200
@@ -31,7 +31,7 @@
 progname=`basename $0`
 
 # ../ will lead us to the home
-dbhome="$progdir/.."
+dbhome=/var/lib/hsqldb
 
 # absolutize dbhome
 
@@ -40,7 +40,7 @@
 #
 # bring in needed functions
 
-. ${dbhome}/lib/functions
+. /var/lib/hsqldb/lib/functions
 
 #--------------------------------------------------------------------------------------------------------------
 pre_main


--- NEW FILE hsqldb-1.8.0-standard-server.properties ---
# Hsqldb Server cfg file.
# See the Advanced Topics chapter of the Hsqldb User Guide.

server.database.0   file:data/db0
server.dbname.0     firstdb
server.urlid.0      db0-url
server.silent       true
server.trace        false

server.port         9001
server.no_system_exit         true


--- NEW FILE hsqldb-1.8.0-standard-sqltool.rc ---
# $Id: hsqldb-1.73.0-standard-sqltool.rc,v 1.1 2004/12/23 22:21:08 fnasser Exp $

# This is a sample SqlTool configuration file, a.k.a. rc file.

# You can run SqlTool right now by copying this file to your home directory
# and running
#    java -jar /path/to/hsqldb.jar mem
# This will access the first urlid definition below in order to use a 
# personal Memory-Only database.

# If you have the least concerns about security, then secure access to
# your sqltool.rc file.
# See the documentation for SqlTool for various ways to use this file.

# A personal Memory-Only database.
urlid mem
url jdbc:hsqldb:mem:memdbid
username sa
password

# This is for a hsqldb Server running with default settings on your local
# computer (and for which you have not changed the password for "sa").
urlid db0-url
url jdbc:hsqldb:hsql://localhost/firstdb
username sa
password


###########################################################################
# Template for a urlid for an Oracle database.
# You will need to put the oracle.jdbc.OracleDriver class into your 
# classpath.
# In the great majority of cases, you want to use the file classes12.zip
# (which you can get from the directory $ORACLE_HOME/jdbc/lib of any
# Oracle installation compatible with your server).
# Since you need to add to the classpath, you can't invoke SqlTool with
# the jar switch, like "java -jar .../hsqldb.jar..." or 
# "java -jar .../hsqlsqltool.jar...".
# Put both the HSQLDB jar and classes12.zip in your classpath (and export!)
# and run something like "java org.hsqldb.util.SqlTool...".

#urlid cardiff2
#url jdbc:oracle:thin:@aegir.admc.com:1522:TRAFFIC_SID
#username blaine
#password secretpassword
#driver oracle.jdbc.OracleDriver
###########################################################################


###########################################################################
# Template for a urlid for a Postgresql database.
# You will need to put the org.postgresql.Driver class into your 
# classpath.
# The postgresql jar will be named postgresql.jar (if you built Postgresql 
# from source), or something like pg73b1jdbc3.jar or jdbc7.2x-1.2.jar.
# You can obtain it from a client or server Postgresql installation, or 
# download it from http://jdbc.postgresql.org/download.html.
# Notice that the jar file names (other than "postgresql.jar") contain both
# the target Postgresql server version and the client-side JDBC level (which
# is determined by your client-side Java version, as explained at
# http://jdbc.postgresql.org/download.html).
# I recommend the latest production version for your JDBC version.  The 
# later JDBC drivers work better even with older Postgresql servers.
# (E.g. \dt won't list owners with an older driver).
# N.b.: Suse Linux 9.1 users should download a new driver from the PG site,
# since Suse distributes the 7.3 drivers with Postgresql 7.4 (why???).
# Since you need to add to the classpath, you can't invoke SqlTool with
# the jar switch, like "java -jar .../hsqldb.jar..." or 
# "java -jar .../hsqlsqltool.jar...".
# Put both the HSQLDB jar and the Postgresql jar in your classpath (and
# export!) and run something like "java org.hsqldb.util.SqlTool...".
# N.b.:  I notice that Postgresql is unusual in that it does not do an
# implicit commit before DDL commands.  If you get an error message 
# "... cannot run inside a transaction block", just run "commit;" and retry.

#urlid commerce
#url jdbc:postgresql://dbsvr2/commercedb
#username blaine
#password obscured
#driver org.postgresql.Driver
###########################################################################


###########################################################################
# Template for a TLS-encrypted HSQLDB Server.
# Remember that the hostname in hsqls (and https) JDBC URLs must match the
# CN of the server certificate (the port and instance alias that follows 
# are not part of the certificate at all).
# You only need to set "truststore" if the server cert is not approved by
# your system default truststore (which a commercial certificate probably
# would be).

#urlid tls
#url jdbc:hsqldb:hsqls://db.admc.com:9001/lm2
#username blaine
#password asecret
#truststore /home/blaine/ca/db/db-trust.store
###########################################################################


--- NEW FILE hsqldb-1.8.0-standard-webserver.properties ---
# Hsqldb Server cfg file.
# See the Advanced Topics chapter of the Hsqldb User Guide.

server.database.0   file:data/db0
server.dbname.0     firstdb
server.urlid.0      db0-url
server.silent       true
server.trace        false

server.port         80
server.default_page index.html
server.root		./
.html=text/html


--- NEW FILE hsqldb-1.8.0-standard.cfg ---
# $Id: hsqldb-1.73.0-standard.cfg,v 1.1 2004/12/23 22:21:08 fnasser Exp $

# Sample configuration file for HSQLDB database server.
# See the "UNIX Quick Start" chapter of the Hsqldb User Guide.

# N.b.!!!!  You must place this in the right location for your type of UNIX.
# See the init script "hsqldb" to see where this must be placed and
# what it should be renamed to.

# This file is "sourced" by a Bourne shell, so use Bourne shell syntax.

# This file WILL NOT WORK until you set (at least) the non-commented
# variables to the appropriate values for your system.
# Life will be easier if you avoid all filepaths with spaces or any other
# funny characters.  Don't ask for support if you ignore this advice.

# Thanks to Meikel Bisping for his contributions.  -- Blaine

# JPackage hsqldb home is /var/lib/hsqldb

HSQLDB_HOME=/var/lib/hsqldb

# JPackage source Java config

. /etc/java/java.conf

JAVA_EXECUTABLE=${JAVA_HOME}/bin/java

# Unless you copied a hsqldb.jar file from another system, this typically
# resides at $HSQLDB_HOME/lib/hsqldb.jar, where $HSQLDB_HOME is your HSQLDB
# software base directory.
HSQLDB_JAR_PATH=${HSQLDB_HOME}/lib/hsqldb.jar

# Where the file "server.properties" (or "webserver.properties") resides.
SERVER_HOME=${HSQLDB_HOME}

# What UNIX user the Server/WebServer process will run as.
# (The shutdown client is always run as root or the invoker of the init script).
# Runs as root by default, but you should take the time to set database file
# ownerships to another user and set that user name here.
# You do need to run as root if your Server/WebServer will run on a privileged
# (< 1024) port.
# If you really do want to run as root, comment out the HSQLDB_OWNER setting
# completely.  I.e., do not set it to root.  This will run Server/Webserver
# without any "su" at all.
HSQLDB_OWNER=hsqldb

# We require all Server/WebServer instances to be accessible within 
# $MAX_START_SECS from when the Server/WebServer is started.
# Defaults to 60.
# Raise this is you are running lots of DB instances or have a slow server.
#MAX_START_SECS=200
# Ditto for this one
#SU_ECHO_SECS=1

# Time to allow for JVM to die after all HSQLDB instances stopped.
# Defaults to 1.
#MAX_TERMINATE_SECS=0

# These are "urlid" values from a SqlTool authentication file
# ** IN ADDITION TO THOSE IN YOUR server.properties OR webserver.properties **
# file.  All server.urlid.X values from your properties file will automatically
# be started/stopped/tested.  $SHUTDOWN_URLIDS is for additional urlids which
# will stopped.  (Therefore, most users will not set this at all).
# Separate multiple values with white space.  NO OTHER SPECIAL CHARACTERS!
# Make sure to quote the entire value if it contains white space separator(s).
# Defaults to none (i.e., only urlids set in properties file will be stopped).
#SHUTDOWN_URLIDS='sa mygms'

# SqlTool authentication file used only for shutdown.
# The default value will be sqltool.rc in root's home directory, since it is 
# root who runs the init script.
# (See the SqlTool chapter of the HSQLDB User Guide if you don't understand 
# this).
AUTH_FILE=${HSQLDB_HOME}/sqltool.rc

# Set to 'WebServer' to start a HSQLDB WebServer instead of a Server.
# Defaults to 'Server'.
#TARGET_CLASS=WebServer

# Server-side classpath IN ADDITION TO the HSQLDB_JAR_PATH set above.
# The classpath here is *earlier* than HSQLDB_JAR_PATH, to allow you 
# override classes in the HSQLDB_JAR_PATH jar file.
# In particular, you will want to add classpath elements to give access of
# all of your store procedures (store procedures are documented in the 
# HSQLDB User Guide in the SQL Syntax chapter.
# SERVER_ADDL_CLASSPATH=/home/blaine/storedprocs.jar:/usr/dev/dbutil/classes

# For TLS encryption for your Server, set these two variables.
# N.b.:  If you set these, then make this file unreadable to non-root users!!!!
# See the TLS chapter of the HSQLDB User Guide, paying attention to the 
# security warning(s).
# If you are running with a private server cert, then you will also need to 
# set "truststore" in the your SqlTool config file (location is set by the
# AUTH_FILE variable in this file, or it must be at the default location for 
# HSQLDB_OWNER).
#TLS_KEYSTORE=/path/to/jks/server.store
#TLS_PASSWORD=password

# Any JVM args for the invocation of the JDBC client used to verify DB
# instances and to shut them down (SqlToolSprayer).
# For multiple args, put quotes around entire value.
#CLIENT_JVMARGS=-Djavax.net.debug=ssl

# Any JVM args for the server.
# For multiple args, put quotes around entire value.
#SERVER_JVMARGS=-Xmx512m


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/hsqldb/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	23 Jan 2007 01:39:00 -0000	1.8
+++ .cvsignore	31 Aug 2007 14:43:58 -0000	1.9
@@ -1 +1 @@
-hsqldb_1_8_0_7-RHCLEAN.zip
+hsqldb_1_8_0_8.zip


Index: hsqldb.spec
===================================================================
RCS file: /cvs/extras/rpms/hsqldb/devel/hsqldb.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- hsqldb.spec	23 Jan 2007 01:39:00 -0000	1.31
+++ hsqldb.spec	31 Aug 2007 14:43:58 -0000	1.32
@@ -28,28 +28,26 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define _with_gcj_support 1
-
 %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
 
 %define section		devel
 
-%define cvs_version	1_8_0_7
+%define cvs_version	1_8_0_8
 
 Name:		hsqldb
-Version:	1.8.0.7
-Release:	2jpp.2
+Version:	1.8.0.8
+Release:	1jpp
 Epoch:		1
 Summary:	Hsqldb Database Engine
 License:	BSD Style
 Url:		http://hsqldb.sourceforge.net/
-#http://downloads.sourceforge.net/hsqldb/hsqldb_1_8_0_7.zip
-Source0:	%{name}_%{cvs_version}-RHCLEAN.zip
-Source1:	%{name}-%{version}-standard.cfg
-Source2:	%{name}-%{version}-standard-server.properties
-Source3:	%{name}-%{version}-standard-webserver.properties
-Source4:	%{name}-%{version}-standard-sqltool.rc
-Patch0:		%{name}-%{version}-scripts.patch
+#http://downloads.sourceforge.net/hsqldb/hsqldb_1_8_0_8.zip
+Source0:	%{name}_%{cvs_version}.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
+Patch0:		%{name}-1.8.0-scripts.patch
 Patch1:		hsqldb-tmp.patch
 Requires:	servletapi5
 Requires(post):   /bin/rm,/bin/ln
@@ -65,6 +63,8 @@
 Buildarch:	noarch
 %endif
 Buildroot:	%{_tmppath}/%{name}-%{version}-buildroot
+Distribution:	JPackage
+Vendor:		JPackage Project
 
 %if %{gcj_support}
 BuildRequires:		java-gcj-compat-devel
@@ -267,34 +267,26 @@
 %{_datadir}/%{name}
 
 %changelog
-* Thu Jan 22 2007 Deepak Bhole <dbhole at redhat.com> 1:1.8.0.7-1jpp.2
-- Bump release to build in rawhide
+* Fri Aug 31 2007 Fernando Nasser <fnasser at redhat.com> 1:1.8.0.8-1jpp
+- Upgrade to 1.8.0.8
 
-* Thu Jan 22 2007 Deepak Bhole <dbhole at redhat.com> 1:1.8.0.7-1jpp.1
-- Updgrade to 1.8.0.7
+* Mon Jan 22 2007 Deepak Bhole <dbhole at redhat.com> 1:1.8.0.7-2jpp
+- Update copyright date
 
-* Thu Nov 30 2006 Deepak Bhole <dbhole at redhat.com> 1:1.8.0.4-4jpp.2
-- Bump release to build in rawhide
+* Thu Jan 11 2007 Deepak Bhole <dbhole at redhat.com> 1.8.0.7-1jpp
+- Updgrade to 1.8.0.7
 
-* Wed Nov 29 2006 Deepak Bhole <dbhole at redhat.com> 1:1.8.0.4-4jpp.1
+* Wed Nov 29 2006 Deepak Bhole <dbhole at redhat.com> 1.8.0.4-4jpp
 - Added missing entries to the files section
+- From fnasser at redhat.com:
+  - Add post requires for servletapi5 to ensure installation order
+- From sgrubb at redhat.com:
+  - Apply patch correcting tmp file usage
 
-* Wed Oct 11 2006 Fernando Nasser <fnasser at redhat.com> 1:1.8.0.4-3jpp.4
-- Add post requires for servletapi5 to ensure installation order
-
-* Sun Oct 01 2006 Jesse Keating <jkeating at redhat.com> 1:1.8.0.4-3jpp.3
-- rebuilt for unwind info generation, broken in gcc-4.1.1-21
-
-* Wed Sep 20 2006 Steve Grubb <sgrubb at redhat.com> 1:1.8.0.4-3jpp.2
-- Apply patch correcting tmp file usage
-
-* Mon Aug 21 2006 Deepak Bhole <dbhole at redhat.com> 1:1.8.0.4-3jpp.1
+* Mon Aug 21 2006 Deepak Bhole <dbhole at redhat.com> 1:1.8.0.4-3jpp
 - Add missing postun section.
 
-* Tue Aug 08 2006 Deepak Bhole <dbhole at redhat.com> 1:1.8.0.4-2jpp.2
-- Fix regression re: missing shadow-utils prereq.
-
-* Fri Aug 04 2006 Deepak Bhole <dbhole at redhat.com> 1:1.8.0.4-2jpp.1
+* Fri Aug 04 2006 Deepak Bhole <dbhole at redhat.com> 1:1.8.0.4-2jpp
 - Add missing requirements.
 - Merge with fc spec.
   - From gbenson at redhat.com:


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/hsqldb/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	23 Jan 2007 01:39:00 -0000	1.7
+++ sources	31 Aug 2007 14:43:58 -0000	1.8
@@ -1 +1 @@
-013010f468b11b7e8f25056f3d9976fc  hsqldb_1_8_0_7-RHCLEAN.zip
+aba52450db9b3b70d312d0f298010ffe  hsqldb_1_8_0_8.zip


--- hsqldb-1.8.0.7-scripts.patch DELETED ---


--- hsqldb-1.8.0.7-standard-server.properties DELETED ---


--- hsqldb-1.8.0.7-standard-sqltool.rc DELETED ---


--- hsqldb-1.8.0.7-standard-webserver.properties DELETED ---


--- hsqldb-1.8.0.7-standard.cfg DELETED ---


