From: Jan Rękorajski <baggins@pld-linux.org>
Date: Tue, 14 Dec 2004 16:23:00 +0000 (+0000)
Subject: - release 3
X-Git-Tag: auto/th/ant-1_6_5-1_1~17
X-Git-Url: https://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=306092ef9890abf3cb48fd2878dbaca21b339556;p=packages%2Fant.git

- release 3
- I guess _nobody_ _really_ _used_ _this_, cause install was totally fucked up

Changed files:
    ant.spec -> 1.35
---

diff --git a/ant.spec b/ant.spec
index 56d28e8..bd52ef3 100644
--- a/ant.spec
+++ b/ant.spec
@@ -5,7 +5,7 @@ Summary(it):	Tool per la compilazione di programmi java
 Summary(pl):	ant - narzêdzie do budowania w Javie
 Name:		jakarta-ant
 Version:	1.6.2
-Release:	2
+Release:	3
 License:	Apache
 Group:		Development/Languages/Java
 Source0:	http://www.apache.org/dist/ant/source/apache-ant-%{version}-src.tar.bz2
@@ -91,13 +91,13 @@ sh build.sh
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_javadir}}
 
-install bootstrap/bin/{ant,antRun,runant.pl,runant.py} $RPM_BUILD_ROOT%{_bindir}
-install bootstrap/lib/ant-*.jar $RPM_BUILD_ROOT%{_javadir}
-install bootstrap/lib/ant.jar $RPM_BUILD_ROOT%{_javadir}/ant-%{version}.jar
+install dist/bin/{ant,antRun,runant.pl,runant.py} $RPM_BUILD_ROOT%{_bindir}
+install dist/lib/ant-*.jar $RPM_BUILD_ROOT%{_javadir}
+install dist/lib/ant.jar $RPM_BUILD_ROOT%{_javadir}/ant-%{version}.jar
 ln -sf ant-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/ant.jar
 
 # xerces-j 2.6.2
-install bootstrap/lib/xercesImpl.jar $RPM_BUILD_ROOT%{_javadir}
+install dist/lib/x*.jar $RPM_BUILD_ROOT%{_javadir}
 ln -sf xercesImpl.jar $RPM_BUILD_ROOT%{_javadir}/jaxp_parser_impl.jar
 
 # this looks strange