[packages/tomcat] - make sure older tomcat-native cannot be used

arekm arekm at pld-linux.org
Tue Feb 11 21:04:23 CET 2014


commit ee5c7fb1320aa496f86bfddaca83cf4b00e0175d
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Tue Feb 11 21:04:21 2014 +0100

    - make sure older tomcat-native cannot be used

 tomcat.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/tomcat.spec b/tomcat.spec
index f05d8a2..bfca9bf 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -5,6 +5,8 @@
 %define		jspapiver	2.2
 %define		servletapiver	3.0
 
+%define		tomcatnatver	1.1.27
+
 # Java Commons Logging version. Must be >= 1.1.
 %define		jclver	1.1.1
 
@@ -77,13 +79,14 @@ Requires:	jre >= 1.2
 Requires:	jsvc
 Requires:	rc-scripts
 Suggests:	logrotate
-Suggests:	tomcat-native >= 1.1.27
+Suggests:	tomcat-native >= %{tomcatnatver}
 Provides:	group(servlet)
 Provides:	group(tomcat)
 Provides:	user(tomcat)
 Obsoletes:	apache-tomcat
 Obsoletes:	jakarta-tomcat
 Conflicts:	logrotate < 3.8.0
+Conflicts:	tomcat-native < %{tomcatnatver}
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/tomcat.git/commitdiff/ee5c7fb1320aa496f86bfddaca83cf4b00e0175d



More information about the pld-cvs-commit mailing list