rpms/tomcat5/devel tomcat5.spec,1.112,1.113

[Tom Callaway (spot)]

Author: spot

Update of /cvs/pkgs/rpms/tomcat5/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9898

Modified Files:
	tomcat5.spec 
Log Message:
fix repotag


Index: tomcat5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat5/devel/tomcat5.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- tomcat5.spec	23 May 2008 19:41:00 -0000	1.112
+++ tomcat5.spec	10 Jul 2008 19:41:46 -0000	1.113
@@ -69,7 +69,7 @@
 Name: tomcat5
 Epoch: 0
 Version: 5.5.26
-Release: 1jpp.3%{?dist}
+Release: 1.4%{?dist}
 Summary: Apache Servlet/JSP Engine, RI for Servlet 2.4/JSP 2.0 API
 
 Group: Networking/Daemons
@@ -215,7 +215,8 @@
 Summary:                Web applications for Apache Tomcat
 Requires(post):         jpackage-utils >= 0:1.6.0
 Requires(preun):        findutils
-Requires(preun):        /bin/rm
+# For /bin/rm
+Requires(preun):        coreutils
 
 %if %{gcj_support}
 Requires(post):         java-gcj-compat >= 1.0.31
@@ -232,11 +233,13 @@
 Requires(postun):       %{name} = %{epoch}:%{version}-%{release}
 Requires:               struts >= 0:1.1
 Summary:                The administrative web applications for Apache Tomcat
-Requires(post):         /bin/rm
+# for /bin/rm
+Requires(post):         coreutils
 Requires(post):         jpackage-utils >= 0:1.6.0
 Requires(post):         findutils
 Requires(preun):        findutils
-Requires(preun):        /bin/rm
+# for /bin/rm
+Requires(preun):        coreutils
 
 %if %{gcj_support}
 Requires(post):         java-gcj-compat >= 1.0.31
@@ -249,15 +252,16 @@
 
 %package servlet-%{servletspec}-api
 Group: Internet/WWW/Dynamic Content
-Requires: /usr/sbin/update-alternatives
+# for /usr/sbin/update-alternatives
+Requires: chkconfig
 Summary: Apache Tomcat Servlet implementation classes
 Obsoletes: servletapi5
 Provides: servlet
 Provides: servlet5
 Provides: servlet24
 Provides: servletapi5
-Requires(post):         /sbin/chkconfig
-requires(postun):       /sbin/chkconfig
+Requires(post):         chkconfig
+requires(postun):       chkconfig
 
 %if %{gcj_support}
 # libgcj aot-compiled native libraries
@@ -274,8 +278,8 @@
 Summary: Javadoc generated documentation for %{name}-servlet-%{servletspec}-api
 Obsoletes: servletapi5-javadoc
 Provides: servletapi5-javadoc
-Requires(post): /bin/rm
-Requires(post): /bin/ln
+# for /bin/rm and /bin/ln
+Requires(post): coreutils
 
 %description servlet-%{servletspec}-api-javadoc
 Contains the javadoc generated documentation for the implementation classes
@@ -283,7 +287,8 @@
 
 %package jsp-%{jspspec}-api
 Group: Internet/WWW/Dynamic Content
-Requires: /usr/sbin/update-alternatives
+# for /usr/sbin/update-alternatives
+Requires: chkconfig
 Requires: servlet24
 # We need this to indirectly get rid of legacy jsp included in old
 # servlet packages (one day we will be able to remove this)
@@ -292,8 +297,8 @@
 Requires(postun):       %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release}
 Summary: Apache Tomcat Servlet and JSP implementation classes
 Provides: jsp
-Requires(post):         /sbin/chkconfig
-Requires(postun):       /sbin/chkconfig
+Requires(post):         chkconfig
+Requires(postun):       chkconfig
 
 %if %{gcj_support}
 # libgcj aot-compiled native libraries
@@ -308,8 +313,8 @@
 %package jsp-%{jspspec}-api-javadoc
 Group: Development/Documentation
 Summary: Javadoc generated documentation for %{name}-jsp-%{jspspec}-api
-Requires(post):         /bin/rm
-Requires(post):         /bin/ln
+# for /bin/rm and /bin/ln
+Requires(post):         coreutils
 
 %description jsp-%{jspspec}-api-javadoc
 Contains the javadoc generated documentation for the implementation classes
@@ -343,8 +348,9 @@
 Requires: %{name}-%{jname} = %{epoch}:%{version}-%{release}
 Requires(post):         findutils
 Requires(preun):        findutils
-Requires(post):         /bin/rm
-Requires(preun):        /bin/rm
+# for /bin/rm
+Requires(post):         coreutils
+Requires(preun):        coreutils
 
 %if %{gcj_support}
 # libgcj aot-compiled native libraries
@@ -366,8 +372,9 @@
 Requires(post): %{name}-%{jname} = %{epoch}:%{version}-%{release}
 Requires(post):         findutils
 Requires(preun):        findutils
-Requires(post):         /bin/rm
-Requires(preun):        /bin/rm
+# for /bin/rm
+Requires(post):         coreutils
+Requires(preun):        coreutils
 %if %{gcj_support}
 # libgcj aot-compiled native libraries
 Requires(post):         java-gcj-compat >= 1.0.31
@@ -1299,6 +1306,9 @@
 %endif
 
 %changelog
+* Thu Jul 10 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0:5.5.26-1.4
+- drop repotag
+
 * Fri May 23 2008 Todd Zullinger <tmz at pobox.com> 0:5.5.26-1jpp.3
 - fix license tag