packages: java-commons-chain/java-commons-chain.spec - Disable tests. They ...

[pawelz]

Author: pawelz                       Date: Sat Nov 21 23:50:41 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- Disable tests. They are incompatibile with servlet 2.5.

---- Files affected:
packages/java-commons-chain:
   java-commons-chain.spec (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: packages/java-commons-chain/java-commons-chain.spec
diff -u packages/java-commons-chain/java-commons-chain.spec:1.9 packages/java-commons-chain/java-commons-chain.spec:1.10
--- packages/java-commons-chain/java-commons-chain.spec:1.9	Wed Sep  9 15:59:54 2009
+++ packages/java-commons-chain/java-commons-chain.spec	Sun Nov 22 00:50:36 2009
@@ -2,7 +2,7 @@
 #
 # Conditional build:
 %bcond_with	javadoc		# don't build javadoc
-%bcond_without	tests		# don't build and run tests
+%bcond_with	tests		# don't build and run tests
 
 %if "%{pld_release}" == "ti"
 %bcond_without	java_sun	# build with gcj
@@ -21,6 +21,7 @@
 Group:		Libraries/Java
 Source0:	http://www.apache.org/dist/commons/chain/source/commons-chain-%{version}-src.tar.gz
 # Source0-md5:	a94fef07630d88c859fb8397ddbcb6ba
+Patch0:		%{name}-notests.patch
 URL:		http://commons.apache.org/chain
 BuildRequires:	ant
 BuildRequires:	java(JavaServerFaces) = 1.1
@@ -39,10 +40,10 @@
 BuildRequires:	java-commons-collections
 BuildRequires:	java-junit
 %endif
-BuildRequires:	java(Servlet) = 2.4
+BuildRequires:	java(Servlet)
 Requires:	java(JavaServerFaces) = 1.1
 Requires:	java(Portlet) = 1.0
-Requires:	java(Servlet) = 2.4
+Requires:	java(Servlet)
 Requires:	java-commons-digester >= 1.8
 Requires:	java-commons-logging
 Requires:	jpackage-utils
@@ -108,10 +109,12 @@
 %prep
 %setup -q -n %{srcname}-%{version}-src
 
+%patch0 -p1
+
 %build
 export JAVA_HOME="%{java_home}"
 
-required_jars="servlet-api-2.4 commons-logging commons-digester portlet-api-1.0 faces-api-1.1"
+required_jars="servlet-api commons-logging commons-digester portlet-api-1.0 faces-api-1.1"
 %if %{with tests}
 required_jars=$required_jars" junit commons-collections commons-beanutils-core"
 %endif
@@ -120,7 +123,7 @@
 
 export LC_ALL=en_US # source code not US-ASCII
 
-%ant -Dbuild.sysclasspath=only jar %{?with_javadoc:javadoc}
+%ant -Dbuild.sysclasspath=only %{?with_tests:test} jar %{?with_javadoc:javadoc}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -160,6 +163,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2009/11/21 23:50:36  pawelz
+- Disable tests. They are incompatibile with servlet 2.5.
+
 Revision 1.9  2009/09/09 13:59:54  pawelz
 - require java(Servlet) = 2.4 (it does not build with newer)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-commons-chain/java-commons-chain.spec?r1=1.9&r2=1.10&f=u