packages: java-commons-collections/java-commons-collections.spec - added JD...

[pawelz]

Author: pawelz                       Date: Mon May 18 08:34:05 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added JDK bconds
- simplified (-Dbuild.compiler and SHELL=/bin/sh hack are no longer needed)
- Apache license version

---- Files affected:
packages/java-commons-collections:
   java-commons-collections.spec (1.30 -> 1.31) 

---- Diffs:

================================================================
Index: packages/java-commons-collections/java-commons-collections.spec
diff -u packages/java-commons-collections/java-commons-collections.spec:1.30 packages/java-commons-collections/java-commons-collections.spec:1.31
--- packages/java-commons-collections/java-commons-collections.spec:1.30	Mon Mar 30 07:24:32 2009
+++ packages/java-commons-collections/java-commons-collections.spec	Mon May 18 10:34:00 2009
@@ -2,6 +2,11 @@
 #
 # Conditional build:
 %bcond_without	javadoc		# don't build javadoc
+%if "%{pld_release}" == "ti"
+%bcond_without	java_sun	# build with gcj
+%else
+%bcond_with	java_sun	# build with java-sun
+%endif
 
 %include	/usr/lib/rpm/macros.java
 
@@ -11,7 +16,7 @@
 Name:		java-commons-collections
 Version:	3.2
 Release:	3
-License:	Apache
+License:	Apache v2.0
 Group:		Libraries/Java
 Source0:	http://www.apache.org/dist/commons/collections/source/commons-collections-%{version}-src.tar.gz
 # Source0-md5:	dbf80727b384bfb9c220d78af30ebc14
@@ -19,8 +24,10 @@
 Patch0:		jakarta-commons-collections-target.patch
 URL:		http://commons.apache.org/collections/
 BuildRequires:	ant
-BuildRequires:	java-gcj-compat-devel
+%{!?with_java_sun:BuildRequires:	java-gcj-compat-devel}
+%{?with_java_sun:BuildRequires:	java-sun}
 BuildRequires:	jpackage-utils
+BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
 BuildRequires:	sed >= 4.0
@@ -74,15 +81,10 @@
 find -name '*.jar' | xargs rm -vf
 
 %build
-%ant -Dbuild.compiler=extJavac jar
-
-%if %{with javadoc}
-export SHELL=/bin/sh
-%ant javadoc
-%endif
+%ant jar %{?with_javadoc:javadoc}
 
 # commons-collections-tomcat5
-%ant -Dbuild.compiler=extJavac -f tomcat5-build.xml
+%ant -f tomcat5-build.xml
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -130,6 +132,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.31  2009/05/18 08:34:00  pawelz
+- added JDK bconds
+- simplified (-Dbuild.compiler and SHELL=/bin/sh hack are no longer needed)
+- Apache license version
+
 Revision 1.30  2009/03/30 05:24:32  pawelz
 - Propoer group for tomcat5 subpackage
 
================================================================

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