Thu Aug 4 09:10:02 UTC 2005

Author: gbenson

Update of /cvs/dist/rpms/hsqldb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31997

Modified Files:
	.cvsignore hsqldb.spec sources 
Added Files:
	hsqldb-1.80.1-scripts.patch 
	hsqldb-1.80.1-standard-server.properties 
	hsqldb-1.80.1-standard-sqltool.rc 
	hsqldb-1.80.1-standard-webserver.properties 
	hsqldb-1.80.1-standard.cfg 
Removed Files:
	hsqldb-1.73.0-build_xml.patch hsqldb-1.73.0-scripts.patch 
	hsqldb-1.73.0-standard-server.properties 
	hsqldb-1.73.0-standard-sqltool.rc 
	hsqldb-1.73.0-standard-webserver.properties 
	hsqldb-1.73.0-standard.cfg hsqldb-sunclasses.patch 
Log Message:
Upgrade to 1.8.0.1 (#164072)

hsqldb-1.80.1-scripts.patch:
 runUtil.sh |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE hsqldb-1.80.1-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.80.1-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


***** Error reading new file: [Errno 2] No such file or directory: 'hsqldb-1.80.1-standard-sqltool.rc'

--- NEW FILE hsqldb-1.80.1-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


***** Error reading new file: [Errno 2] No such file or directory: 'hsqldb-1.80.1-standard.cfg'

Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/hsqldb/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	9 Jun 2005 15:30:25 -0000	1.4
+++ .cvsignore	4 Aug 2005 09:09:58 -0000	1.5
@@ -1,4 +1,4 @@
-hsqldb_1_7_3_0-RHCLEAN.zip
+hsqldb_1_8_0_1-RHCLEAN.zip
 hsqldb
 noarch
 *.src.rpm


Index: hsqldb.spec
===================================================================
RCS file: /cvs/dist/rpms/hsqldb/devel/hsqldb.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- hsqldb.spec	16 Jun 2005 13:38:08 -0000	1.5
+++ hsqldb.spec	4 Aug 2005 09:09:58 -0000	1.6
@@ -1,9 +1,9 @@
 %define section		devel
 
 %define name		hsqldb
-%define version		1.73.0
-%define cvs_version	1_7_3_0
-%define release		2jpp_1fc
+%define version		1.80.1
+%define cvs_version	1_8_0_1
+%define release		1jpp_0fc
 
 Name:		%{name}
 Version:	%{version}
@@ -18,8 +18,6 @@
 Source3:	%{name}-%{version}-standard-webserver.properties
 Source4:	%{name}-%{version}-standard-sqltool.rc
 Patch0:		%{name}-%{version}-scripts.patch
-Patch1:		%{name}-%{version}-build_xml.patch
-Patch2:		%{name}-sunclasses.patch
 Requires:	servletapi5
 BuildRequires:	ant
 BuildRequires:	junit
@@ -85,8 +83,6 @@
 chmod -R go=u-w *
 
 %patch0
-%patch1
-%patch2 -p1
 
 %build
 export CLASSPATH=$(build-classpath \
@@ -198,7 +194,13 @@
 %{_datadir}/%{name}
 
 %changelog
-* Thu Jun 16 2005 Gary Benson <gbenson at redhat.com> 0:1.73.0-1jpp_1fc
+* Wed Aug  3 2005 Gary Benson <gbenson at redhat.com>
+- Upgrade to 1.8.0.1 (#164072).
+
+* Tue Jul 26 2005 Fernando Nasser <fnasser at redhat.com> 0:1.80.1-1jpp
+- Upgrade to 1.8.0.1
+
+* Thu Jun 16 2005 Gary Benson <gbenson at redhat.com> 0:1.73.0-2jpp_1fc
 - Build into Fedora.
 
 * Thu Jun  9 2005 Gary Benson <gbenson at redhat.com>
@@ -208,10 +210,10 @@
 - Avoid Sun-specific classes.
 - Build with servletapi5.
 
-* Thu Dec 23 2004 Fernando Nasser <fnasser at redhat.com> 0:1.73.0-1jpp_1rh
-- Merge with upstream for upgrade
+* Mon Mar 07 2005 Fernando Nasser <fnasser at redhat.com> 0:1.73.3-1jpp
+- Upgrade to 1.7.3.3
 
-* Thu Dec 23 2004 Fernando Nasser <fnasser at redhat.com> 0:1.73.0-1jpp
+* Wed Mar 02 2005 Fernando Nasser <fnasser at redhat.com> 0:1.73.0-1jpp
 - Upgrade to 1.7.3.0
 
 * Thu Dec 23 2004 Fernando Nasser <fnasser at redhat.com> 0:1.72.3-2jpp_1rh


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/hsqldb/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 Jun 2005 15:30:25 -0000	1.4
+++ sources	4 Aug 2005 09:09:58 -0000	1.5
@@ -1 +1 @@
-fd1a7c22fe6bf88e0b453f74c14abd33  hsqldb_1_7_3_0-RHCLEAN.zip
+bef8dccc4278e1d7a35a6f2ade0892bc  hsqldb_1_8_0_1-RHCLEAN.zip


--- hsqldb-1.73.0-build_xml.patch DELETED ---


--- hsqldb-1.73.0-scripts.patch DELETED ---


--- hsqldb-1.73.0-standard-server.properties DELETED ---


--- hsqldb-1.73.0-standard-sqltool.rc DELETED ---


--- hsqldb-1.73.0-standard-webserver.properties DELETED ---


--- hsqldb-1.73.0-standard.cfg DELETED ---


--- hsqldb-sunclasses.patch DELETED ---


