SPECS: ant.spec - adapterized - fixed last log message

[pawelz]

Author: pawelz                       Date: Wed Oct 22 22:45:17 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- adapterized
- fixed last log message

---- Files affected:
SPECS:
   ant.spec (1.96 -> 1.97) 

---- Diffs:

================================================================
Index: SPECS/ant.spec
diff -u SPECS/ant.spec:1.96 SPECS/ant.spec:1.97
--- SPECS/ant.spec:1.96	Thu Oct 23 00:21:45 2008
+++ SPECS/ant.spec	Thu Oct 23 00:45:12 2008
@@ -58,18 +58,17 @@
 Source0:	http://www.apache.org/dist/ant/source/apache-%{name}-%{version}-src.tar.bz2
 # Source0-md5:	22b378e27ab300e4d73bf09d91c7e2a6
 Source1:	%{name}.conf
-Patch0:		%{name}-antRun.patch
 URL:		http://ant.apache.org/
 %{?with_antlr:BuildRequires:	antlr}
 %{?with_apache_bsf:BuildRequires:	beanshell}
 %{?with_apache_bsf:BuildRequires:	bsf}
 %{?with_javamail:BuildRequires:	jaf}
+%{?with_jai:BuildRequires:	jai}
 %{?with_apache_bcel:BuildRequires:	jakarta-bcel}
 %{?with_commons_logging:BuildRequires:	jakarta-commons-logging}
 %{?with_commons_net:BuildRequires:	jakarta-commons-net}
 %{?with_apache_oro:BuildRequires:	jakarta-oro}
 %{?with_apache_regexp:BuildRequires:	jakarta-regexp}
-%{?with_jai:BuildRequires:	jai}
 %{?with_javamail:BuildRequires:	javamail}
 BuildRequires:	jaxp_parser_impl
 %{?with_jdepend:BuildRequires:	jdepend}
@@ -83,6 +82,7 @@
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.300
 %{?with_apache_resolver:BuildRequires:	xml-commons-resolver}
+Patch0:		%{name}-antRun.patch
 Requires:	jdk
 Requires:	jpackage-utils
 Obsoletes:	jakarta-ant
@@ -562,7 +562,7 @@
 %{?with_jsch:required_jars="$required_jars jsch"}
 %{?with_netrexx:required_jars="$required_jars NetRexxC"}
 
-export CLASSPATH="`/usr/bin/build-classpath $required_jars`"
+export CLASSPATH="`%{_bindir}/build-classpath $required_jars`"
 
 sh build.sh --noconfig main javadocs
 
@@ -888,8 +888,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.97  2008/10/22 22:45:12  pawelz
+- adapterized
+- fixed last log message
+
 Revision 1.96  2008/10/22 22:21:45  pawelz
-- do not modify $RPM_BUILD_ROOT in %install. It breaks ./repackage.sh.
+- do not modify $RPM_BUILD_DIR in %install. It breaks ./repackage.sh.
 
 Revision 1.95  2008/10/22 22:08:01  pawelz
 - create %ghost symlink in %post
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/ant.spec?r1=1.96&r2=1.97&f=u