SPECS: apache-tomcat.spec - do not force the newest version of junit - by d...

[pawelz]

Author: pawelz                       Date: Tue Apr  7 10:43:57 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- do not force the newest version of junit
- by default build without jta (apache tomcat is not JEE compliant app server
  so it does not have to contain jta. And jta is problematic because of
  license)

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

---- Diffs:

================================================================
Index: SPECS/apache-tomcat.spec
diff -u SPECS/apache-tomcat.spec:1.87 SPECS/apache-tomcat.spec:1.88
--- SPECS/apache-tomcat.spec:1.87	Tue Apr  7 12:28:07 2009
+++ SPECS/apache-tomcat.spec	Tue Apr  7 12:43:52 2009
@@ -4,6 +4,7 @@
 #
 # Conditional build:
 %bcond_without	javadoc	# skip building javadocs
+%bcond_with	jta	# put jta jar into tomcat lib dir.
 #
 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
@@ -51,8 +52,8 @@
 BuildRequires:	java-commons-modeler >= 2.0
 BuildRequires:	java-commons-pool >= 0:1.2
 BuildRequires:	java-commons-pool-tomcat5 >= 0:1.2
-BuildRequires:	java-jta >= 0:1.0.1
-BuildRequires:	java-junit >= 0:3.8.1
+%{?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}
@@ -97,7 +98,7 @@
 Requires:	jndi >= 1.2.1
 Requires:	jre >= 1.2
 Requires:	jsse >= 1.0.2
-Requires:	jta >= 1.0.1
+%{?with_jta:Requires:	jta >= 1.0.1}
 Requires:	rc-scripts
 Provides:	group(tomcat)
 Provides:	java-servlet-container
@@ -214,6 +215,8 @@
 %endif
 
 # build tomcat 5.5
+# XXX build process should fail if one of these find-jar commands fails
+#     how to fix that?
 cat > build.properties <<EOF
 commons-beanutils.jar=$(find-jar commons-beanutils-core)
 commons-launcher.jar=$(find-jar commons-launcher)
@@ -240,7 +243,7 @@
 jcert.jar=$(find-jar jcert)
 jnet.jar=$(find-jar jnet)
 jsse.jar=$(find-jar jsse)
-jta.jar=$(find-jar jta)
+%{?with_jta:jta.jar=$(find-jar jta)}
 puretls.jar=$(find-jar puretls)
 servlet-api.jar=$(find-jar servlet-api)
 servletapi.build.notrequired=true
@@ -326,7 +329,7 @@
 ln -sf jdbc-stdext.jar $TOMCATDIR/common/lib/jdbc-stdext-2.0.jar
 ln -sf $(find-jar jmxri) $TOMCATDIR/common/lib/jmxri.jar
 ln -sf $(find-jar jndi) $TOMCATDIR/common/lib/jndi.jar
-ln -sf $(find-jar jta) $TOMCATDIR/common/lib/jta.jar
+%{?with_jta:ln -sf $(find-jar jta) $TOMCATDIR/common/lib/jta.jar}
 ln -sf $(find-jar mail) $TOMCATDIR/common/lib/mail.jar
 ln -sf $(find-jar jsse) $TOMCATDIR/common/lib/jsse.jar
 ln -sf $(find-jar junit) $TOMCATDIR/common/lib/junit.jar
@@ -455,6 +458,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+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
+  so it does not have to contain jta. And jta is problematic because of
+  license)
+
 Revision 1.87  2009/04/07 10:28:07  pawelz
 - java- prefix for some dpes
 
================================================================

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