packages: jcommon/jcommon.spec - pldize, jdk bconds - disable tests (tests ...

[pawelz]

Author: pawelz                       Date: Tue Apr  6 12:12:29 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- pldize, jdk bconds
- disable tests (tests were build, packaged but not executed, it makes no sense)

---- Files affected:
packages/jcommon:
   jcommon.spec (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: packages/jcommon/jcommon.spec
diff -u packages/jcommon/jcommon.spec:1.8 packages/jcommon/jcommon.spec:1.9
--- packages/jcommon/jcommon.spec:1.8	Tue Apr  6 13:44:19 2010
+++ packages/jcommon/jcommon.spec	Tue Apr  6 14:12:24 2010
@@ -2,8 +2,14 @@
 #
 # Conditional build:
 %bcond_without	javadoc		# don't build javadoc
-%bcond_without	tests		# don't build and run tests
-#
+%bcond_with	tests		# don't build tests
+
+%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
 %define		srcname		jcommon
 Summary:	Common library for Object Refinery Projects
@@ -13,12 +19,15 @@
 Release:	0.1
 License:	LGPL
 Group:		Libraries/Java
-Source0:	http://dl.sourceforge.net/jfreechart/%{srcname}-%{version}.tar.gz
+Source0:	http://downloads.sourceforge.net/jfreechart/%{srcname}-%{version}.tar.gz
 # Source0-md5:	5fb774c225cdc7d15a99c9702031ae05
 URL:		http://www.jfree.org/jcommon/index.html
 BuildRequires:	ant
+%{!?with_java_sun:BuildRequires:	java-gcj-compat-devel}
+%{?with_java_sun:BuildRequires:	java-sun}
 BuildRequires:	jpackage-utils >= 0:1.5
-BuildRequires:	junit
+%{?with_tests:BuildRequires:	junit}
+BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
 %if %(locale -a | grep -q '^en_US$'; echo $?)
@@ -69,8 +78,10 @@
 find . -name '*.jar' | xargs rm -v
 
 %build
-export CLASSPATH=$(build-classpath junit)
 export LC_ALL=en_US # source code not US-ASCII
+%if %{with tests}
+CLASSPATH=$(build-classpath junit)
+%endif
 %ant -f ant/build.xml -Dbuildstable=true -Dproject.outdir=. -Dbasedir=. \
 	compile %{?with_tests:compile-junit-tests} %{?with_javadoc:javadoc}
 
@@ -124,6 +135,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2010/04/06 12:12:24  pawelz
+- pldize, jdk bconds
+- disable tests (tests were build, packaged but not executed, it makes no sense)
+
 Revision 1.8  2010/04/06 11:44:19  pawelz
 - renamed from jcommon (there is pending cvsadmin request to actually rename files)
 
================================================================

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