packages: ant-contrib/ant-contrib.spec - builds now

[glen]

Author: glen                         Date: Fri Oct 21 21:47:04 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- builds now

---- Files affected:
packages/ant-contrib:
   ant-contrib.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/ant-contrib/ant-contrib.spec
diff -u packages/ant-contrib/ant-contrib.spec:1.1 packages/ant-contrib/ant-contrib.spec:1.2
--- packages/ant-contrib/ant-contrib.spec:1.1	Fri Oct 21 21:32:30 2011
+++ packages/ant-contrib/ant-contrib.spec	Fri Oct 21 23:46:59 2011
@@ -1,12 +1,10 @@
 # $Revision$, $Date$
-# TODO
-# - some deps missing:
-#build_contrib_jar:
-#    [javac] Compiling 88 source files to ant-contrib/build/classes
-#    [javac] ant-contrib/src/net/sf/antcontrib/antserver/server/ConnectionHandler.java:22: package org.apache.xml.serialize does not exist
+#
+# Conditional build:
+%bcond_without	javadoc		# don't build javadoc
 
-%define		subver b2
-%define		rel	0.1
+%define		subver	b2
+%define		rel		1
 Summary:	Collection of tasks for Ant
 Name:		ant-contrib
 Version:	1.0
@@ -19,6 +17,7 @@
 Patch0:		build_xml.patch
 Patch2:		antservertest.patch
 BuildRequires:	ant-junit >= 1.6.2
+BuildRequires:	ant >= 1.6
 BuildRequires:	java(jaxp_parser_impl)
 BuildRequires:	java-bcel >= 5.0
 BuildRequires:	java-junit >= 3.8.0
@@ -54,18 +53,24 @@
 
 %build
 junit_jar=$(find-jar junit)
-ln -s $junit_jar test/lib/junit-$(JUNIT_VER).jar
+xerces_jar=$(find-jar xercesImpl)
+ln -sf $junit_jar test/lib
+ln -sf $xerces_jar lib
 
 export OPT_JAR_LIST="ant/ant-junit junit"
 export CLASSPATH=
 CLASSPATH=build/lib/ant-contrib-%{version}.jar:$CLASSPATH
-echo $ANT_HOME
-%ant -Dsource=1.4 -Dversion=%{version} -Dbcel.jar=file://%{_javadir}/bcel.jar all
+%ant jar %{?with_javadoc:docs} \
+	-Djavac.target=1.4 \
+	-Djavac.source=1.4 \
+	-Dversion=%{version} \
+	-Dbcel.jar=file://%{_javadir}/bcel.jar
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 # jars
+install -d $RPM_BUILD_ROOT%{_javadir}/ant
 cp -p build/lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/ant/%{name}.jar
 
 # javadoc
@@ -90,10 +95,12 @@
 %{_sysconfdir}/ant.d/ant-contrib
 %{_javadir}/ant/*.jar
 
+%if %{with javadoc}
 %files javadoc
 %defattr(644,root,root,755)
 %doc %{_javadocdir}/%{name}-%{version}
 %doc %{_javadocdir}/%{name}
+%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -101,5 +108,8 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2011/10/21 21:46:59  glen
+- builds now
+
 Revision 1.1  2011/10/21 19:32:30  glen
 - new, based on fedora package
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ant-contrib/ant-contrib.spec?r1=1.1&r2=1.2&f=u