SPECS: ApacheJServ.spec - added sysconfig - use %service macro - d...

[glen]

Author: glen                         Date: Fri Jan  6 18:47:27 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added sysconfig
- use %service macro
- disable insecure selfservlet by default

---- Files affected:
SPECS:
   ApacheJServ.spec (1.50 -> 1.51) 

---- Diffs:

================================================================
Index: SPECS/ApacheJServ.spec
diff -u SPECS/ApacheJServ.spec:1.50 SPECS/ApacheJServ.spec:1.51
--- SPECS/ApacheJServ.spec:1.50	Thu Dec 29 15:07:02 2005
+++ SPECS/ApacheJServ.spec	Fri Jan  6 19:47:21 2006
@@ -12,7 +12,7 @@
 Summary(pl):	Silnik serwletów ze wsparciem dla wiodącego serwera WWW
 Name:		ApacheJServ
 Version:	1.1.2
-Release:	0.79
+Release:	0.82
 License:	freely distributable & usable (JServ), LGPL (JSDK)
 Group:		Networking/Daemons
 Source0:	http://java.apache.org/jserv/dist/%{name}-%{version}.tar.gz
@@ -21,15 +21,17 @@
 # Source1-md5:	a81feddb91b1358f9aaed94e83eddb54
 Source2:	%{name}.conf
 Source3:	%{name}.init
+Source4:	%{name}.sysconfig
 Patch0:		%{name}-enable-secret.patch
 Patch1:		%{name}-ac.patch
 Patch2:		%{name}-jre-env.patch
+Patch3:		%{name}-config.patch
 URL:		http://java.apache.org/
 BuildRequires:	apache1-devel >= 1.3.9-8
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	gettext-devel
-BuildRequires:	rpmbuild(macros) >= 1.228
+BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	sed >= 4.0
 %if %{with gcj}
 BuildRequires:	fastjar
@@ -52,6 +54,7 @@
 Provides:	jserv
 Provides:	user(jserv)
 Obsoletes:	ApacheJServ-init
+Obsoletes:	jserv
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_pkglibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
@@ -108,6 +111,7 @@
 %patch0 -p0
 %patch1 -p0
 %patch2 -p1
+%patch3 -p1
 
 sed -i -e '
 	s|@JSDK_CLASSES@|%{_javadir}/servlet-2.0.jar|g
@@ -162,10 +166,11 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,%{httpdconf}/conf.d,%{_javadir}}
+install -d $RPM_BUILD_ROOT{/etc/{sysconfig,rc.d/init.d},%{httpdconf}/conf.d,%{_javadir}}
 
 install %{SOURCE2} $RPM_BUILD_ROOT%{httpdconf}/conf.d/80_mod_jserv.conf
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/jserv
+install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/jserv
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -212,9 +217,7 @@
 
 %preun
 if [ "$1" = 0 ]; then
-	if [ -f /var/lock/subsys/jserv ]; then
-		/etc/rc.d/init.d/jserv stop 1>&2
-	fi
+	%service jserv stop
 	/sbin/chkconfig --del jserv
 fi
 
@@ -248,6 +251,7 @@
 %attr(640,root,jserv) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/jserv.properties
 %attr(640,root,jserv) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/zone.properties
 %attr(754,root,root) /etc/rc.d/init.d/jserv
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/jserv
 %{_javadir}/ApacheJServ.jar
 %{_javadir}/servlet-2.0.jar
 %dir %{_datadir}/jserv
@@ -278,6 +282,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.51  2006/01/06 18:47:21  glen
+- added sysconfig
+- use %service macro
+- disable insecure selfservlet by default
+
 Revision 1.50  2005/12/29 14:07:02  glen
 - fixed packaged files
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/ApacheJServ.spec?r1=1.50&r2=1.51&f=u