diff options
| author | Ivan Afonichev <ivan.afonichev@gmail.com> | 2011-08-15 23:28:31 +0400 |
|---|---|---|
| committer | Ivan Afonichev <ivan.afonichev@gmail.com> | 2011-08-15 23:28:31 +0400 |
| commit | 009133147f66bdb56b3b36d2df4e877deda83709 (patch) | |
| tree | 6fe9d2bfd3bcac8dd56794f0570767dc64c2469c | |
| parent | f0cf232913a363c0cae6767a060f2546f9109406 (diff) | |
| download | tomcat-009133147f66bdb56b3b36d2df4e877deda83709.tar.gz tomcat-009133147f66bdb56b3b36d2df4e877deda83709.tar.xz tomcat-009133147f66bdb56b3b36d2df4e877deda83709.zip | |
Require java < 1.7.0
| -rw-r--r-- | tomcat.spec | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/tomcat.spec b/tomcat.spec index 35f3545..b42592b 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -54,7 +54,7 @@ Name: tomcat Epoch: 0 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Group: System Environment/Daemons @@ -86,7 +86,8 @@ 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.6.0 +BuildRequires: java-devel < 1:1.7.0 BuildRequires: jpackage-utils >= 0:1.7.0 BuildRequires: junit BuildRequires: log4j @@ -98,6 +99,7 @@ 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: procps Requires: %{name}-lib = %{epoch}:%{version}-%{release} Requires(pre): shadow-utils @@ -565,6 +567,9 @@ fi %{appdir}/sample %changelog +* Mon Aug 15 2011 Ivan Afonichev <ivan.afonichev@gmail.com> 0:7.0.20-2 +- Require java < 1.7.0 + * Mon Aug 15 2011 Ivan Afonichev <ivan.afonichev@gmail.com> 0:7.0.20-1 - Updated to 7.0.20 |