SPECS (tomcat5): jakarta-tomcat.spec - use %service - truncate cha...

glen glen at pld-linux.org
Wed Jan 31 19:42:58 CET 2007 

Author: glen                         Date: Wed Jan 31 18:42:58 2007 GMT
Module: SPECS                         Tag: tomcat5
---- Log message:
- use %service
- truncate changelog

---- Files affected:
SPECS:
   jakarta-tomcat.spec (1.36.2.1 -> 1.36.2.2) 

---- Diffs:

================================================================
Index: SPECS/jakarta-tomcat.spec
diff -u SPECS/jakarta-tomcat.spec:1.36.2.1 SPECS/jakarta-tomcat.spec:1.36.2.2
--- SPECS/jakarta-tomcat.spec:1.36.2.1	Wed Dec 28 20:07:47 2005
+++ SPECS/jakarta-tomcat.spec	Wed Jan 31 19:42:53 2007
@@ -14,13 +14,13 @@
 Source0:	http://www.apache.org/dist/tomcat/tomcat-5/v5.0.30/src/%{name}-%{version}-src.tar.gz
 # Source0-md5:	13fa1b56779c7b258c95266f69b22437
 Source1:	%{name}.init
-#Patch0:		%{name}-fixes.patch
-#Patch1:		%{name}-JAVA_HOME.patch
-#Patch2:		%{name}-fileupload.patch
+#Patch0:	%{name}-fixes.patch
+#Patch1:	%{name}-JAVA_HOME.patch
+#Patch2:	%{name}-fileupload.patch
 URL:		http://jakarta.apache.org/tomcat/index.html
 # required:
+BuildRequires:	ant >= 1.5.3
 BuildRequires:	jaas
-BuildRequires:	jakarta-ant >= 1.5.3
 BuildRequires:	jakarta-commons-beanutils
 BuildRequires:	jakarta-commons-collections
 BuildRequires:	jakarta-commons-digester
@@ -31,9 +31,10 @@
 BuildRequires:	jakarta-struts >= 1.0.2
 BuildRequires:	jaxp_parser_impl
 BuildRequires:	jdk >= 1.2
+BuildRequires:	jpackage-utils
 BuildRequires:	mx4j >= 1.1.1
 BuildRequires:	puretls
-BuildRequires:	rpmbuild(macros) >= 1.202
+BuildRequires:	rpmbuild(macros) >= 1.300
 # optional:
 BuildRequires:	jaf >= 1.0.1
 BuildRequires:	jakarta-commons-daemon
@@ -46,6 +47,7 @@
 BuildRequires:	jsse >= 1.0.2
 BuildRequires:	jta >= 1.0.1
 BuildRequires:	junit >= 3.7
+BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	tyrex >= 1.0
 BuildRequires:	xml-commons
 Requires(post,postun):	/sbin/ldconfig
@@ -73,6 +75,7 @@
 Requires:	jsse >= 1.0.2
 Requires:	jta >= 1.0.1
 Requires:	mx4j >= 1.1.1
+Requires:	rc-scripts
 Requires:	tyrex >= 1.0
 Requires:	xml-commons
 Provides:	group(http)
@@ -158,7 +161,7 @@
 EOBP
 
 JAVA_HOME=%{_libdir}/java
-ant -Djava.home=$JAVA_HOME
+%ant -Djava.home=$JAVA_HOME
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -248,17 +251,11 @@
 
 %post
 /sbin/chkconfig --add tomcat
-if [ -f /var/lock/subsys/tomcat ]; then
-	/etc/rc.d/init.d/tomcat restart 1>&2
-else
-	echo "Run \"/etc/rc.d/init.d/tomcat start\" to start tomcat daemon."
-fi
+%service tomcat restart
 
 %preun
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/tomcat ]; then
-		/etc/rc.d/init.d/tomcat stop 1>&2
-	fi
+	%service tomcat stop
 	/sbin/chkconfig --del tomcat
 fi
 
@@ -303,136 +300,15 @@
 %doc catalina/docs/*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
+
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.36.2.2  2007/01/31 18:42:53  glen
+- use %service
+- truncate changelog
+
 Revision 1.36.2.1  2005/12/28 19:07:47  glen
 - started tomcat5, all fails. everyone is welcome to help
-
-Revision 1.36  2005/12/13 12:56:54  glen
-- adapterized (sorted %verify attrs)
-
-Revision 1.35  2005/11/20 13:24:08  saq
-- reverted faulty commit (1.34)
-
-Revision 1.34  2005/06/18 20:00:10  saq
-- pythonprov reqs python and doesn't python-modules
-
-Revision 1.33  2005/05/01 17:31:30  glen
-- use %useradd/%groupadd macros
-
-Revision 1.32  2004/12/14 16:59:56  baggins
-- DON'T hardcode java paths!
-
-Revision 1.31  2004/12/14 15:48:07  baggins
-- DON'T hardcode paths!
-
-Revision 1.30  2004/08/20 21:33:11  ankry
-- use %userremove/%groupremove, some cosmetics
-
-Revision 1.29  2003/08/18 08:08:12  gotar
-- mass commit: cosmetics (removed trailing white spaces)
-
-Revision 1.28  2003/08/11 22:46:31  ankry
-- cosmetics
-
-Revision 1.27  2003/07/02 11:37:08  pascalek
-- Release 4
-- Changed build requirements and requirements
-- Changed build style
-- Cosmetics
-- Still don't work like I would it to work :(
-
-Revision 1.26  2003/06/26 22:44:48  qboosh
-- s/apache/tomcat/ in pre
-
-Revision 1.25  2003/06/26 11:41:55  pascalek
-- Release 3:
-- Added pre, post, postun scripts
-- %files fixed
-
-Revision 1.24  2003/06/25 13:27:35  pascalek
-- updated to 4.1.28
-
-Revision 1.23  2003/05/28 12:59:13  malekith
-- massive attack: source-md5
-
-Revision 1.22  2003/05/25 05:49:05  misi3k
-- massive attack s/pld.org.pl/pld-linux.org/
-
-Revision 1.21  2003/03/26 17:30:49  qboosh
-- replaced copies of more .jars by symlinks, added some missing
-- changed /etc/tomcat dir permissions - tomcat starts now (but still throws
-  some exceptions)
-- release 2
-
-Revision 1.20  2003/03/10 20:21:16  misiek
-- more updates
-
-Revision 1.19  2003/03/10 16:56:03  misiek
-- more updates; now builds
-
-Revision 1.18  2003/03/06 08:19:32  misiek
-- started update to 4.1.18 (doesn't build yet)
-
-Revision 1.17  2002/12/13 15:24:04  ankry
-- adapterized
-
-Revision 1.16  2002/12/02 11:06:20  ankry
-- massive cleaning
-
-Revision 1.15  2002/11/26 21:55:31  misiek
-- JAVA_HOME is back (modified)
-
-Revision 1.14  2002/11/26 21:46:30  misiek
-- updated to 4.0.6
-
-Revision 1.13  2002/08/24 20:44:15  qboosh
-- standarized JAVA_HOME, added versions to BR/R
-- fixed xerces path
-- fixes patch: for build dependencies and for typo in examples/jsp/index.html
-- moved work dir to /var/lib/tomcat (it's used to write compiled jsp pages)
-- changed permissions for /var dirs (group http for now... not root)
-- added missing dirs
-- JAVA_HOME patch - detect standard JAVA_HOME, so setting it is not needed
-- added simple init script
-
-Revision 1.12  2002/08/18 17:16:35  blues
-- release 3 - license fix, new doc
-
-Revision 1.11  2002/05/14 08:55:08  blues
-- exit when JAVA_HOME is not set
-
-Revision 1.10  2002/04/25 16:38:37  arturs
-- fixed a small typo
-
-Revision 1.9  2002/03/13 10:54:15  aflinta
- - changed JAVA_HOME patch to proper location
- - release 2
-
-Revision 1.8  2002/02/23 02:59:08  kloczek
-- adapterized.
-
-Revision 1.7  2002/02/22 23:29:05  kloczek
-- removed all Group fields translations (our rpm now can handle translating
-  Group field using gettext).
-
-Revision 1.6  2002/01/18 02:13:23  kloczek
-- perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
-
-Revision 1.5  2002/01/09 16:04:32  ankry
-- updated source URL
-
-Revision 1.4  2002/01/09 08:16:37  pascalek
-- updated to 4.0.1
-
-Revision 1.3  2001/11/30 12:39:22  qboosh
-- pl translation, cosmetics, removed bashism
-
-Revision 1.2  2001/10/02 09:51:24  pascalek
-- SOURCE1 removed
-
-Revision 1.1  2001/10/02 09:49:51  pascalek
-- initial revision
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/jakarta-tomcat.spec?r1=1.36.2.1&r2=1.36.2.2&f=u

More information about the pld-cvs-commit mailing list