SPECS: bootchart.spec - actually builds

[glen]

Author: glen                         Date: Tue Dec  5 21:23:24 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- actually builds

---- Files affected:
SPECS:
   bootchart.spec (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SPECS/bootchart.spec
diff -u SPECS/bootchart.spec:1.3 SPECS/bootchart.spec:1.4
--- SPECS/bootchart.spec:1.3	Tue Dec  5 22:17:00 2006
+++ SPECS/bootchart.spec	Tue Dec  5 22:23:19 2006
@@ -12,7 +12,9 @@
 URL:		http://www.bootchart.org/
 BuildRequires:	ant
 BuildRequires:	jakarta-commons-cli >= 0:1.0
+BuildRequires:	jaxp_parser_impl
 BuildRequires:	jpackage-utils >= 0:1.5
+BuildRequires:	rpmbuild(macros) >= 1.294
 Requires:	jakarta-commons-cli >= 0:1.0
 Requires:	jpackage-utils >= 0:1.5
 BuildArch:	noarch
@@ -60,7 +62,11 @@
 %build
 # Remove the bundled commons-cli
 rm -rf lib/org/apache/commons/cli lib/org/apache/commons/lang
-CLASSPATH=%{_javadir}/commons-cli.jar ant
+
+required_jars="commons-cli"
+export CLASSPATH="`/usr/bin/build-classpath $required_jars`"
+
+%ant
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -85,8 +91,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post javadoc
-rm -f %{_javadocdir}/%{name}
-ln -s %{name}-%{version} %{_javadocdir}/%{name}
+ln -sf %{name}-%{version} %{_javadocdir}/%{name}
 
 %postun javadoc
 if [ "$1" = "0" ]; then
@@ -132,6 +137,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2006/12/05 21:23:19  glen
+- actually builds
+
 Revision 1.3  2006/12/05 21:17:00  glen
 - source-md5
 - grubby full path
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/bootchart.spec?r1=1.3&r2=1.4&f=u