SPECS: apache-tomcat.spec - force sun's jdk - sorted BRs - cosmetics

[pawelz]

Author: pawelz                       Date: Tue Apr  7 10:46:01 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- force sun's jdk
- sorted BRs
- cosmetics

---- Files affected:
SPECS:
   apache-tomcat.spec (1.88 -> 1.89) 

---- Diffs:

================================================================
Index: SPECS/apache-tomcat.spec
diff -u SPECS/apache-tomcat.spec:1.88 SPECS/apache-tomcat.spec:1.89
--- SPECS/apache-tomcat.spec:1.88	Tue Apr  7 12:43:52 2009
+++ SPECS/apache-tomcat.spec	Tue Apr  7 12:45:56 2009
@@ -53,23 +53,23 @@
 BuildRequires:	java-commons-pool >= 0:1.2
 BuildRequires:	java-commons-pool-tomcat5 >= 0:1.2
 %{?with_jta:BuildRequires:	java-jta >= 0:1.0.1}
-BuildRequires:	junit >= 0:3.8.1
 BuildRequires:	java-log4j
 BuildRequires:	java-puretls
 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
 BuildRequires:	javamail >= 0:1.3.1
 BuildRequires:	jaxp_parser_impl >= 0:2.7.1
 BuildRequires:	jdbc-stdext >= 0:2.0
-BuildRequires:	jdk >= 1.5
 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
 Requires(post,preun):	/sbin/chkconfig
@@ -216,7 +216,7 @@
 
 # build tomcat 5.5
 # XXX build process should fail if one of these find-jar commands fails
-#     how to fix that?
+#	 how to fix that?
 cat > build.properties <<EOF
 commons-beanutils.jar=$(find-jar commons-beanutils-core)
 commons-launcher.jar=$(find-jar commons-launcher)
@@ -458,6 +458,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.89  2009/04/07 10:45:56  pawelz
+- force sun's jdk
+- sorted BRs
+- cosmetics
+
 Revision 1.88  2009/04/07 10:43:52  pawelz
 - do not force the newest version of junit
 - by default build without jta (apache tomcat is not JEE compliant app server
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/apache-tomcat.spec?r1=1.88&r2=1.89&f=u