Author: pawelz Date: Wed Apr 8 07:40:03 2009 GMT
Module: SPECS Tag: HEAD
---- Log message:
- jdk-dependend BRs
---- Files affected:
SPECS:
apache-tomcat.spec (1.89 -> 1.90)
---- Diffs:
================================================================
Index: SPECS/apache-tomcat.spec
diff -u SPECS/apache-tomcat.spec:1.89 SPECS/apache-tomcat.spec:1.90
--- SPECS/apache-tomcat.spec:1.89 Tue Apr 7 12:45:56 2009
+++ SPECS/apache-tomcat.spec Wed Apr 8 09:39:58 2009
@@ -3,8 +3,9 @@
# - packages for *.renametojar files (-cgi and -ssi in server/lib)
#
# Conditional build:
-%bcond_without javadoc # skip building javadocs
-%bcond_with jta # put jta jar into tomcat lib dir.
+%bcond_without javadoc # skip building javadocs
+%bcond_with jta # put jta jar into tomcat lib dir.
+%bcond_without java_sun # build with gcj (does not work)
#
Summary: Apache Servlet/JSP Engine, RI for Servlet 2.4/JSP 2.0 API
Summary(pl.UTF-8): Silnik Servlet/JSP Apache będący wzorcową implementacją
API Servlet 2.4/JSP 2.0
@@ -31,6 +32,13 @@
# this patch is needed for struts >= 1.3
Patch6: %{name}-struts.patch
URL: http://tomcat.apache.org/
+%if %{with java-sun}
+BuildRequires: java-sun >= 1.5
+BuildRequires: java-sun-jre >= 1.5
+%else
+BuildRequires: java-gcj-compat-devel
+BuildRequires: jsse >= 0:1.0.3
+%endif
BuildRequires: ant >= 1.5.3
BuildRequires: ant-trax
BuildRequires: eclipse-jdt
@@ -58,7 +66,6 @@
BuildRequires: java-servletapi5 = %{version}
#BuildRequires: java-struts >= 0:1.2.7
BuildRequires: java-struts >= 1.0.2
-BuildRequires: java-sun >= 1.5
BuildRequires: java-xerces >= 0:2.7.1
BuildRequires: java-xml-commons
#BuildRequires: java-xml-commons >= 1.3
@@ -68,7 +75,6 @@
BuildRequires: jmx
BuildRequires: jndi >= 0:1.2.1
BuildRequires: jpackage-utils
-BuildRequires: jsse >= 0:1.0.3
BuildRequires: junit >= 0:3.8.1
BuildRequires: rpmbuild(macros) >= 1.300
Requires(post,postun): /sbin/ldconfig
@@ -458,6 +464,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.90 2009/04/08 07:39:58 pawelz
+- jdk-dependend BRs
+
Revision 1.89 2009/04/07 10:45:56 pawelz
- force sun's jdk
- sorted BRs
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/apache-tomcat.spec?r1=1.89&r2=1.90&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
