- up to 1.5.4

[packages/ant.git] / ant.spec

diff --git a/ant.spec b/ant.spec
index 0db13070ffc2f004c0e5f232dda84fb082fe6ba6..74f626292ef10d19305fa0fe2188002a2aebae24 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.4.1
-Release:       3
-License:       Apache Software License
+Version:       1.5.4
+Release:       1
+License:       Apache
 Group:         Development/Languages/Java
-Source0:       http://jakarta.apache.org/builds/%{name}/release/v%{version}/src/%{name}-%{version}-src.tar.gz
-Source1:       http://jakarta.apache.org/builds/%{name}/release/v%{version}/bin/%{name}-%{version}-optional.jar
+Source0:       http://www.apache.org/dist/ant/source/apache-ant-%{version}-src.tar.bz2
+# Source0-md5: bfac23721c24e77d0b1c383200327ff6
 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,46 +39,42 @@ Dokumentacja do ant - niezale
 w Javie.
 
 %prep
-%setup -q
+%setup -q -n apache-ant-%{version}
 %patch0 -p1
 
 %build
-if [ ! `echo $JAVA_HOME` ]; then 
-       echo "You haven't JAVA_HOME variable set. Can't continue."
-       exit 1
+if [ -z "$JAVA_HOME" ]; then
+       JAVA_HOME=/usr/lib/java
 fi
+export JAVA_HOME
 
-CLASSPATH="$JAVA_HOME/jre/lib/rt.jar:%{SOURCE1}"
-export CLASSPATH
-
-cp -f %{SOURCE1} .
 sh build.sh
 
 %install
 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/optional.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
-
-gzip -9nf KEYS LICENSE README WHATSNEW
+ln -sf . $RPM_BUILD_ROOT%{_javaclassdir}/lib
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc *.gz
+%doc KEYS LICENSE README WHATSNEW
 %attr(755,root,root) %{_bindir}/ant
 %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)