SPECS: hsqldb.spec - initscript integration for -server

[glen]

Author: glen                         Date: Thu Mar  1 22:15:38 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- initscript integration for -server

---- Files affected:
SPECS:
   hsqldb.spec (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: SPECS/hsqldb.spec
diff -u SPECS/hsqldb.spec:1.12 SPECS/hsqldb.spec:1.13
--- SPECS/hsqldb.spec:1.12	Thu Mar  1 22:59:25 2007
+++ SPECS/hsqldb.spec	Thu Mar  1 23:15:33 2007
@@ -10,7 +10,7 @@
 Summary(pl.UTF-8):	Silnik relacyjnych baz danych SQL napisany w Javie
 Name:		hsqldb
 Version:	1.8.0.7
-Release:	0.4
+Release:	0.6
 License:	BSD Style
 Group:		Development/Languages/Java
 Source0:	http://dl.sourceforge.net/hsqldb/%{name}_%{_ver}.zip
@@ -20,7 +20,7 @@
 Source3:	%{name}-standard-webserver.properties
 Source4:	%{name}-standard-sqltool.rc
 Patch0:		%{name}-scripts.patch
-#Patch1:	%{name}-build_xml.patch
+Patch1:		%{name}-pld.patch
 URL:		http://www.hsqldb.org/
 BuildRequires:	ant
 BuildRequires:	jdk
@@ -93,6 +93,7 @@
 %package server
 Summary:	HSQLDB server
 Group:		Applications/Databases
+Requires(post,preun):	/sbin/chkconfig
 Requires(postun):	/usr/sbin/groupdel
 Requires(postun):	/usr/sbin/userdel
 Requires(pre):	/bin/id
@@ -100,6 +101,7 @@
 Requires(pre):	/usr/sbin/groupadd
 Requires(pre):	/usr/sbin/useradd
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	rc-scripts
 Requires:	servletapi4
 Provides:	group(hsqldb)
 Provides:	user(hsqldb)
@@ -110,8 +112,8 @@
 
 %prep
 %setup -q -n %{name}
-%patch0
-#%patch1
+%patch0 -p0
+%patch1 -p1
 
 # remove all binary libs
 %{!?with_binary:rm -f lib/hsqldb.jar}
@@ -179,12 +181,18 @@
 %useradd -u 169 -g %{name} -s /bin/sh -d %{_localstatedir}/lib/%{name} %{name}
 
 %post server
-ln -sf $(build-classpath hsqldb) %{_localstatedir}/lib/%{name}/lib/hsqldb.jar
 ln -sf $(build-classpath servletapi4) %{_localstatedir}/lib/%{name}/lib/servlet.jar
+/sbin/chkconfig --add %{name}
+%service %{name} restart
 
 %preun server
 if [ "$1" = "0" ]; then
-	rm -f %{_localstatedir}/lib/%{name}/lib/hsqldb.jar
+	%service -q %{name} stop
+	/sbin/chkconfig --del %{name}
+fi
+
+%postun server
+if [ "$1" = "0" ]; then
 	rm -f %{_localstatedir}/lib/%{name}/lib/servlet.jar
 	%userremove %{name}
 	%groupremove %{name}
@@ -234,6 +242,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2007/03/01 22:15:33  glen
+- initscript integration for -server
+
 Revision 1.12  2007/03/01 21:59:25  darekr
 - missing dir
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/hsqldb.spec?r1=1.12&r2=1.13&f=u