- use java-xerces instead of java(jaxp_parser_impl) BR which is bogus in this case

[packages/ant-contrib.git] / ant-contrib.spec

diff --git a/ant-contrib.spec b/ant-contrib.spec
index 40a6cd0656e1bcd89436d9d97a75f303e76dfc9d..0913e0fa050e103ac2c947ff5eabd69c8928f5c6 100644 (file)
--- a/ant-contrib.spec
+++ b/ant-contrib.spec
@@ -1,11 +1,9 @@
-# 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
-
-%define                subver b2
-%define                rel     0.1
+#
+# Conditional build:
+%bcond_without javadoc         # don't build javadoc
+
+%define                subver  b2
+%define                rel             1
 Summary:       Collection of tasks for Ant
 Name:          ant-contrib
 Version:       1.0
@@ -16,11 +14,12 @@ URL:                http://ant-contrib.sourceforge.net/
 Source0:       http://downloads.sourceforge.net/ant-contrib/%{name}-%{version}%{subver}-src.tar.gz
 # Source0-md5: 66511dddcef3dc9798db33dbaca0d3de
 Patch0:                build_xml.patch
-Patch2:                antservertest.patch
+Patch1:                antservertest.patch
+BuildRequires: ant >= 1.6
 BuildRequires: ant-junit >= 1.6.2
-BuildRequires: java(jaxp_parser_impl)
 BuildRequires: java-bcel >= 5.0
 BuildRequires: java-junit >= 3.8.0
+BuildRequires: java-xerces
 BuildRequires: jdk >= 1.4.2
 BuildRequires: jpackage-utils >= 1.5
 BuildRequires: rpmbuild(macros) >= 1.553
@@ -28,6 +27,7 @@ Requires:     ant >= 1.6.2
 Requires:      java(jaxp_parser_impl)
 Requires:      java-junit >= 3.8.0
 BuildArch:     noarch
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 The Ant-Contrib project is a collection of tasks (and at one point
@@ -41,10 +41,9 @@ Group:               Documentation
 API documentation for Ant contrib tasks.
 
 %prep
-%setup -q  -n %{name}
+%setup -q -n %{name}
 %patch0
-%patch2
-
+%patch1
 %undos manual/tasks/foreach.html manual/tasks/for.html
 
 %{__rm} -r test/src/net/sf/antcontrib/antclipse
@@ -53,18 +52,23 @@ install -d test/lib
 
 %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
@@ -89,7 +93,9 @@ ln -nfs %{name}-%{version} %{_javadocdir}/%{name}
 %{_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