SPECS: ant.spec - use jpackage-utils for rpm macros and preparing ...

jajcus jajcus at pld-linux.org
Fri May 19 15:48:35 CEST 2006


Author: jajcus                       Date: Fri May 19 13:48:35 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use jpackage-utils for rpm macros and preparing $CLASSPATH

---- Files affected:
SPECS:
   ant.spec (1.47 -> 1.48) 

---- Diffs:

================================================================
Index: SPECS/ant.spec
diff -u SPECS/ant.spec:1.47 SPECS/ant.spec:1.48
--- SPECS/ant.spec:1.47	Fri May 19 13:17:00 2006
+++ SPECS/ant.spec	Fri May 19 15:48:29 2006
@@ -1,8 +1,8 @@
 # $Revision$, $Date$
+%include /usr/lib/rpm/macros.java
 #
 # TODO:
 #	- prepare all BR and test the full build
-
 # Conditional build:
 %bcond_with	bootstrap	# minimal build for bootstrap
 %bcond_without	antlr		# disable building antlr optional task(s)
@@ -34,6 +34,7 @@
 %undefine	with_jsch
 %endif
 #
+#
 Summary:	Ant build tool for Java
 Summary(fr):	Outil de compilation pour java
 Summary(it):	Tool per la compilazione di programmi java
@@ -63,14 +64,17 @@
 %{?with_jsch:BuildRequires:	jsch}
 %{?with_junit:BuildRequires:	junit}
 %{?with_bsf:BuildRequires:	jython}
+BuildRequires:	jaxp_parser_impl
+BuildRequires:	jpackage-utils
 BuildRequires:	rpm-pythonprov
 Requires:	jdk
+Requires:	jpackage-utils
 Obsoletes:	jakarta-ant
 BuildArch:	noarch
-ExclusiveArch:	i586 i686 pentium3 pentium4 athlon %{x8664}
+ExclusiveArch:	i586 i686 pentium3 pentium4 athlon %{x8664} noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_java_home	/usr/lib/java
+
 %define 	ant_home 	%{_datadir}/ant
 
 %description
@@ -403,7 +407,7 @@
 export JAVA_HOME=%{_libdir}/java
 
 export CLASSPATH=""
-required_jars=""
+required_jars="jaxp_parser_impl"
 %{?with_junit:required_jars="$required_jars junit"}
 %{?with_antlr:required_jars="$required_jars antlr"}
 %{?with_bsf:required_jars="$required_jars bsf jython beanshell"}
@@ -419,15 +423,9 @@
 %{?with_jdepend:required_jars="$required_jars jdepend"}
 %{?with_jsch:required_jars="$required_jars jsch"}
 
-for jar_name in $required_jars ; do
-	if ! [ -f "%{_javadir}/${jar_name}.jar" ] ; then
-		echo "%{_javadir}/${jar_name}.jar missing. Broken BuildRequires?" >&2
-		exit 1
-	fi
-	CLASSPATH="$CLASSPATH:%{_javadir}/${jar_name}.jar"
-done
+CLASSPATH="`/usr/bin/build-classpath $required_jars`"
 
-export JAVA_HOME=%{_java_home}
+export JAVA_HOME=%{java_home}
 sh build.sh --noconfig main javadocs
 
 %install
@@ -746,6 +744,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.48  2006/05/19 13:48:29  jajcus
+- use jpackage-utils for rpm macros and preparing $CLASSPATH
+
 Revision 1.47  2006/05/19 11:17:00  jajcus
 - package renamed to "ant"
 - bconds for all optional tasks requiring more than just JDK to build
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/ant.spec?r1=1.47&r2=1.48&f=u



More information about the pld-cvs-commit mailing list