packages: tomcat/tomcat.spec - do not use epoch when not defined

[glen]

Author: glen                         Date: Wed May  9 10:51:36 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- do not use epoch when not defined

---- Files affected:
packages/tomcat:
   tomcat.spec (1.194 -> 1.195) 

---- Diffs:

================================================================
Index: packages/tomcat/tomcat.spec
diff -u packages/tomcat/tomcat.spec:1.194 packages/tomcat/tomcat.spec:1.195
--- packages/tomcat/tomcat.spec:1.194	Mon Mar 19 10:18:18 2012
+++ packages/tomcat/tomcat.spec	Wed May  9 12:51:30 2012
@@ -63,14 +63,14 @@
 Requires(pre):	/usr/sbin/useradd
 Requires:	java(jaxp_parser_impl)
 Requires:	java(jndi) >= 1.2.1
-Requires:	java-%{name}-catalina = %{epoch}:%{version}-%{release}
-Requires:	java-%{name}-coyote = %{epoch}:%{version}-%{release}
-Requires:	java-%{name}-jasper = %{epoch}:%{version}-%{release}
+Requires:	java-%{name}-catalina = %{version}-%{release}
+Requires:	java-%{name}-coyote = %{version}-%{release}
+Requires:	java-%{name}-jasper = %{version}-%{release}
 Requires:	java-commons-dbcp-tomcat5 >= 0:1.1
 Requires:	java-commons-pool-tomcat5
 Requires:	java-jdbc-mysql
 Requires:	java-mail
-Requires:	java-servletapi = %{epoch}:%{version}-%{release}
+Requires:	java-servletapi = %{version}-%{release}
 Requires:	jpackage-utils
 Requires:	jre >= 1.2
 Requires:	jsvc
@@ -124,7 +124,7 @@
 Summary:	The Apache Tomcat Servlet/JSP application manager
 Summary(pl.UTF-8):	Zarządca aplikacji w Tomcacie
 Group:		Networking/Daemons/Java/Servlets
-Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 
 %description webapp-manager
 The Apache Tomcat Servlet/JSP application manager.
@@ -136,7 +136,7 @@
 Summary:	The Apache Tomcat Servlet/JSP virtual hosts manager
 Summary(pl.UTF-8):	Zarządca wirtualnych hostów w Tomcacie
 Group:		Networking/Daemons/Java/Servlets
-Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 Obsoletes:	tomcat-admin
 
 %description webapp-host-manager
@@ -149,7 +149,7 @@
 Summary:	The Apache Tomcat Servlet/JSP example applications
 Summary(pl.UTF-8):	Przykładowe aplikacje dla Tomcata
 Group:		Networking/Daemons/Java/Servlets
-Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 
 %description webapp-examples
 The Apache Tomcat Servlet/JSP example applications.
@@ -161,7 +161,7 @@
 Summary:	Web Services support (JSR 109)
 Summary(pl.UTF-8):	Wsparcie dla Web Services (JSR 109)
 Group:		Libraries/Java
-Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 Requires:	java(JSR109)
 Requires:	java-geronimo-spec-jaxrpc
 
@@ -176,7 +176,7 @@
 Summary:	JMX remote interface for Tomcat
 Summary(pl.UTF-8):	Zdalny interfejs JMX dla Tomcata
 Group:		Libraries/Java
-Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 
 %description jmx
 JMX remote interface for Tomcat.
@@ -534,6 +534,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.195  2012/05/09 10:51:30  glen
+- do not use epoch when not defined
+
 Revision 1.194  2012/03/19 09:18:18  paszczus
 - updated to 7.0.26
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/tomcat/tomcat.spec?r1=1.194&r2=1.195