[hsqldb] Update to new upstream version.
Alexander Kurtakov
akurtakov at fedoraproject.org
Mon Jan 24 10:17:17 UTC 2011
commit 6bdac06dc11bd21b37b3a1464b0a32409b259860
Author: Alexander Kurtakov <akurtako at redhat.com>
Date: Mon Jan 24 12:16:37 2011 +0200
Update to new upstream version.
Fixes for the merge review.
.gitignore | 1 +
hsqldb-1.8.0-specify-su-shell.patch | 33 ++++++++-
hsqldb.spec | 132 ++++++++++++++++-------------------
sources | 2 +-
4 files changed, 90 insertions(+), 78 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 91beaf3..e8bc647 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
hsqldb_1_8_0_10.zip
+hsqldb_1_8_1_3.zip
diff --git a/hsqldb-1.8.0-specify-su-shell.patch b/hsqldb-1.8.0-specify-su-shell.patch
index 43f610b..10bba3a 100644
--- a/hsqldb-1.8.0-specify-su-shell.patch
+++ b/hsqldb-1.8.0-specify-su-shell.patch
@@ -1,7 +1,23 @@
-diff -up ./bin/hsqldb.sav ./bin/hsqldb
---- ./bin/hsqldb.sav 2007-10-16 17:29:58.000000000 -0400
-+++ ./bin/hsqldb 2007-10-16 17:30:25.000000000 -0400
-@@ -366,7 +366,7 @@ running with pid $HSQLDB_PID."
+--- bin/hsqldb.orig 2011-01-24 11:59:14.356301132 +0200
++++ bin/hsqldb 2011-01-24 12:00:06.278430417 +0200
+@@ -41,7 +41,7 @@
+ # use this file.
+
+ # This stuff will be ignored by systems that don't use chkconfig.
+-# chkconfig: 345 87 13
++# chkconfig: - 87 13
+ # description: Hsqldb, A High Performance Java Database
+ # pidfile: /var/run/hsqldb.pid
+ # config: /etc/sysconfig/hsqldb
+@@ -51,7 +51,6 @@
+ # Provides: HSQLDB-Server
+ # Required-Start: $syslog $remote_fs $network $named
+ # Required-Stop:
+-# Default-Start: 3 5
+ # Default-Stop: 0 1 2 6
+ # Short-Description: HSQLDB-Server
+ # Description: Hsqldb, A High Performance Java Database Server
+@@ -369,7 +368,7 @@ running with pid $HSQLDB_PID."
# Some OSes choke if there are newlines in this string.
# N.b.!!! The shell of the -c command is the target user's default
# login shell, so keep this command shell-independent!
@@ -10,3 +26,12 @@ diff -up ./bin/hsqldb.sav ./bin/hsqldb
else
cd "$SERVER_HOME" || {
echo "Failed to cd to '$SERVER_HOME'" 1>&2
+@@ -464,7 +463,7 @@ See log file '$LOGFILE'." 1>&2
+ echo "Successful shutdown ${SHUTDOWN_OPTION} (for the $TARGET_CLASS process)!"
+ exit 0
+ ;;
+- restart|restartcompacted)
++ restart|restartcompacted|reload)
+ STOP_COMMAND=stop
+ [ "$COMMAND" = restartcompacted ] && STOP_COMMAND=stopcompact
+ "${INVOC_PATH}"hsqldb $STOP_COMMAND || exit $?
diff --git a/hsqldb.spec b/hsqldb.spec
index 7ca0755..c7b3921 100644
--- a/hsqldb.spec
+++ b/hsqldb.spec
@@ -28,41 +28,37 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-%global cvs_version 1_8_0_10
-
-Name: hsqldb
-Version: 1.8.0.10
-Release: 6%{?dist}
-Epoch: 1
-Summary: Hsqldb Database Engine
-License: BSD
-URL: http://hsqldb.sourceforge.net/
-#http://downloads.sourceforge.net/hsqldb/hsqldb_1_8_0_9.zip
-Source0: %{name}_%{cvs_version}.zip
+%global cvs_version 1_8_1_3
+
+Name: hsqldb
+Version: 1.8.1.3
+Release: 1%{?dist}
+Epoch: 1
+Summary: HyperSQL Database Engine
+License: BSD
+URL: http://hsqldb.sourceforge.net/
+Source0: http://downloads.sourceforge.net/hsqldb/%{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
-Source5: http://mirrors.ibiblio.org/pub/mirrors/maven2/%{name}/%{name}/%{version}/%{name}-%{version}.pom
+Source5: http://mirrors.ibiblio.org/pub/mirrors/maven2/%{name}/%{name}/1.8.0.10/%{name}-1.8.0.10.pom
Patch0: %{name}-1.8.0-scripts.patch
Patch1: hsqldb-tmp.patch
Patch2: %{name}-1.8.0-specify-su-shell.patch
-Patch3: %{name}-1.8.0-bitxor-bitor.patch
-Patch4: %{name}-1.8.0-autoincrement.patch
Requires: servlet25
Requires(post): coreutils
-Requires(post): servlet25
Requires(preun): coreutils
-Requires(pre): shadow-utils
+Requires(preun): initscripts
+Requires(pre): shadow-utils
Requires(post): jpackage-utils
Requires(postun): jpackage-utils
-BuildRequires: ant
-BuildRequires: junit
-BuildRequires: jpackage-utils >= 0:1.5
-BuildRequires: servlet25
-Group: Development/Java
-BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
+BuildRequires: ant
+BuildRequires: junit
+BuildRequires: jpackage-utils >= 0:1.5
+BuildRequires: servlet25
+Group: Applications/Databases
+BuildArch: noarch
%description
HSQLdb is a relational database engine written in JavaTM , with a JDBC
@@ -82,26 +78,23 @@ database management system that is completely free under the Modified
BSD License. Yes, that's right, completely free of cost or restrictions!
%package manual
-Summary: Manual for %{name}
-Group: Development/Java
+Summary: Manual for %{name}
+Group: Documentation
%description manual
Documentation for %{name}.
%package javadoc
-Summary: Javadoc for %{name}
-Group: Development/Java
-# For /bin/rm and /bin/ln
-Requires(post): coreutils
-Requires(preun): coreutils
+Summary: Javadoc for %{name}
+Group: Documentation
%description javadoc
Javadoc for %{name}.
%package demo
-Summary: Demo for %{name}
-Group: Development/Java
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Summary: Demo for %{name}
+Group: Development/Tools
+Requires: %{name} = %{epoch}:%{version}-%{release}
%description demo
Demonstrations and samples for %{name}.
@@ -125,17 +118,11 @@ chmod -R go=u-w *
%patch0
%patch1 -p1
%patch2
-%patch3 -p8
-%patch4 -p3
cp %{SOURCE5} ./pom.xml
%build
export CLASSPATH=$(build-classpath \
-jsse/jsse \
-jsse/jnet \
-jsse/jcert \
-jdbc-stdext \
servlet \
junit)
pushd build
@@ -145,8 +132,7 @@ 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
@@ -163,17 +149,16 @@ install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/webserver
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
+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
+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}
+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}
@@ -181,11 +166,19 @@ cp -r doc/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
cp index.html $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
# Maven metadata
-install -pD -T -m 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+install -pD -T -m 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
%add_to_maven_depmap %{name} %{name} %{version} JPP %{name}
-%clean
-rm -rf $RPM_BUILD_ROOT
+pushd $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/lib
+ ln -s $(build-classpath hsqldb) hsqldb.jar
+ ln -s $(build-classpath servlet) servlet.jar
+popd
+
+%preun
+if [ $1 = 0 ] ; then
+ /sbin/service %{name} stop >/dev/null 2>&1
+ /sbin/chkconfig --del %{name}
+fi
%pre
# Add the "hsqldb" user and group
@@ -195,38 +188,25 @@ rm -rf $RPM_BUILD_ROOT
-d %{_localstatedir}/lib/%{name} -r %{name} 2> /dev/null || :
%post
-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 servlet) servlet.jar
-)
+# This adds the proper /etc/rc*.d links for the script
+/sbin/chkconfig --add %{name}
%update_maven_depmap
%postun
%update_maven_depmap
-%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
-
%files
%defattr(-,root,root,-)
-%dir %{_docdir}/%{name}-%{version}
-%doc %{_docdir}/%{name}-%{version}/hsqldb_lic.txt
+%doc doc/hsqldb_lic.txt
%{_javadir}/*
%attr(0755,root,root) %{_bindir}/*
%attr(0755,root,root) %{_sysconfdir}/rc.d/init.d/%{name}
-%attr(0644,root,root) %{_sysconfdir}/sysconfig/%{name}
-%attr(0755,hsqldb,hsqldb) %{_localstatedir}/lib/%{name}/data
+%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
+%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
+%{_localstatedir}/lib/%{name}/server.properties
+%{_localstatedir}/lib/%{name}/webserver.properties
%attr(0600,hsqldb,hsqldb) %{_localstatedir}/lib/%{name}/sqltool.rc
%dir %{_localstatedir}/lib/%{name}
%{_mavendepmapfragdir}/*
@@ -235,17 +215,23 @@ fi
%files manual
%defattr(-,root,root,-)
%doc %{_docdir}/%{name}-%{version}
+%doc doc/hsqldb_lic.txt
%files javadoc
%defattr(-,root,root,-)
-%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}
+%doc doc/hsqldb_lic.txt
%files demo
%defattr(-,root,root,-)
%{_datadir}/%{name}
+%doc doc/hsqldb_lic.txt
%changelog
+* Mon Jan 24 2011 Alexander Kurtakov <akurtako at redhat.com> 1:1.8.1.3-1
+- Update to new upstream version.
+- Fixes for the merge review.
+
* Wed Oct 6 2010 Alexander Kurtakov <akurtako at redhat.com> 1:1.8.0.10-6
- Update to use tomcat6 servlet implementation.
@@ -391,8 +377,8 @@ fi
- new jpp extension
* Fri Nov 09 2001 Christian Zoffoli <czoffoli at littlepenguin.org> 1.61-2jpp
-- added BuildRequires: servletapi3 ant
-- added Requires: servletapi3 ant
+- added BuildRequires: servletapi3 ant
+- added Requires: servletapi3 ant
* Fri Nov 09 2001 Christian Zoffoli <czoffoli at littlepenguin.org> 1.61-1jpp
- complete spec restyle
diff --git a/sources b/sources
index dafaf5c..6c9cb78 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-17410483b5b5f267aa18b7e00b65e6e0 hsqldb_1_8_0_10.zip
+e0d6144108fc05e355bb19684ac4c83a hsqldb_1_8_1_3.zip
More information about the scm-commits
mailing list