summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIvan Afonichev <ivan.afonichev@gmail.com>2011-08-16 00:22:02 +0400
committerIvan Afonichev <ivan.afonichev@gmail.com>2011-08-16 00:22:02 +0400
commit31375978bd3bb680b109bb9d2cbce0c2120c2a8c (patch)
treeb155984f6074f8e44692ac1d0f85044b0f9a7767
parent009133147f66bdb56b3b36d2df4e877deda83709 (diff)
downloadtomcat-31375978bd3bb680b109bb9d2cbce0c2120c2a8c.tar.gz
tomcat-31375978bd3bb680b109bb9d2cbce0c2120c2a8c.tar.xz
tomcat-31375978bd3bb680b109bb9d2cbce0c2120c2a8c.zip
Require java = 1:1.6.0
-rw-r--r--tomcat.spec11
1 files changed, 6 insertions, 5 deletions
diff --git a/tomcat.spec b/tomcat.spec
index b42592b..b83e789 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -54,7 +54,7 @@
Name: tomcat
Epoch: 0
Version: %{major_version}.%{minor_version}.%{micro_version}
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
Group: System Environment/Daemons
@@ -86,8 +86,7 @@ BuildRequires: apache-commons-daemon
BuildRequires: apache-commons-dbcp
BuildRequires: apache-commons-pool
BuildRequires: jakarta-taglibs-standard
-BuildRequires: java-devel >= 1:1.6.0
-BuildRequires: java-devel < 1:1.7.0
+BuildRequires: java-devel = 1:1.6.0
BuildRequires: jpackage-utils >= 0:1.7.0
BuildRequires: junit
BuildRequires: log4j
@@ -98,8 +97,7 @@ Requires: apache-commons-logging
Requires: apache-commons-collections
Requires: apache-commons-dbcp
Requires: apache-commons-pool
-Requires: java >= 1:1.6.0
-Requires: java < 1:1.7.0
+Requires: java = 1:1.6.0
Requires: procps
Requires: %{name}-lib = %{epoch}:%{version}-%{release}
Requires(pre): shadow-utils
@@ -567,6 +565,9 @@ fi
%{appdir}/sample
%changelog
+* Mon Aug 15 2011 Ivan Afonichev <ivan.afonichev@gmail.com> 0:7.0.20-3
+- Require java = 1:1.6.0
+
* Mon Aug 15 2011 Ivan Afonichev <ivan.afonichev@gmail.com> 0:7.0.20-2
- Require java < 1.7.0