- updated to 1.6.1

[packages/ant.git] / ant.spec

diff --git a/ant.spec b/ant.spec
index 03a05d7c7596cf21c409b3a7862dc8cff8af56e4..23296718b2d077cada5e5c1d0197fb353e2615fd 100644 (file)
--- a/ant.spec
+++ b/ant.spec
@@ -1,19 +1,20 @@
 Summary:       ant build tool for Java
 Summary(pl):   ant - narzêdzie do budowania w Javie
 Name:          jakarta-ant
-Version:       1.5.1
+Version:       1.6.1
 Release:       1
 License:       Apache
 Group:         Development/Languages/Java
-Source0:       http://jakarta.apache.org/builds/%{name}/release/v%{version}/src/%{name}-%{version}-src.tar.gz
+Source0:       http://www.apache.org/dist/ant/source/apache-ant-%{version}-src.tar.bz2
+# Source0-md5: 3e1f06aae6b691543299ccb1a5cb038f
 Patch0:                %{name}-ANT_HOME.patch
-URL:           http://jakarta.apache.org/ant/
+URL:           http://ant.apache.org/
 BuildRequires: jdk
 Requires:      jdk
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _javalibdir     /usr/share/java
+%define                _javaclassdir   %{_datadir}/java
 
 %description
 Platform-independent build tool for Java. Ant is a Java based build
@@ -38,7 +39,7 @@ Dokumentacja do ant - niezale
 w Javie.
 
 %prep
-%setup -q
+%setup -q -n apache-ant-%{version}
 %patch0 -p1
 
 %build
@@ -53,12 +54,15 @@ sh build.sh
 rm -rf $RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT%{_bindir}
-install -d $RPM_BUILD_ROOT%{_javalibdir}
+install -d $RPM_BUILD_ROOT%{_javaclassdir}
 install bootstrap/bin/{ant,antRun,runant.pl,runant.py} $RPM_BUILD_ROOT%{_bindir}
-install bootstrap/lib/*.jar $RPM_BUILD_ROOT%{_javalibdir}
+install bootstrap/lib/ant-*.jar $RPM_BUILD_ROOT%{_javaclassdir}
+install bootstrap/lib/xercesImpl.jar $RPM_BUILD_ROOT%{_javaclassdir}
+install bootstrap/lib/ant.jar $RPM_BUILD_ROOT%{_javaclassdir}/ant-%{version}.jar
+ln -sf ant-%{version}.jar $RPM_BUILD_ROOT%{_javaclassdir}/ant.jar
 
 # this looks strange
-ln -sf . $RPM_BUILD_ROOT%{_javalibdir}/lib
+ln -sf . $RPM_BUILD_ROOT%{_javaclassdir}/lib
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -70,8 +74,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/antRun
 %attr(755,root,root) %{_bindir}/runant.pl
 %attr(755,root,root) %{_bindir}/runant.py
-%{_javalibdir}/lib
-%{_javalibdir}/*.jar
+%{_javaclassdir}/lib
+%{_javaclassdir}/*.jar
 
 %files doc
 %defattr(644,root,root,755)