- updated to 1.6.1

[packages/ant.git] / ant.spec

diff --git a/ant.spec b/ant.spec
index 898d256da2cf76088518df28a3e8aaa80720e205..23296718b2d077cada5e5c1d0197fb353e2615fd 100644 (file)
--- a/ant.spec
+++ b/ant.spec
@@ -1,70 +1,81 @@
-Summary:       ant build tool for java
-Summary(pl):   ant narzedzie do budowania w javie
+Summary:       ant build tool for Java
+Summary(pl):   ant - narzêdzie do budowania w Javie
 Name:          jakarta-ant
-Version:       1.4
+Version:       1.6.1
 Release:       1
-License:       Apache Software License
+License:       Apache
 Group:         Development/Languages/Java
-Group(de):     Entwicklung/Sprachen/Java
-Group(pl):     Programowanie/Jêzyki/Java
-Source0:       http://jakarta.apache.org/builds/%{name}/release/v%{version}/src/%{name}-%{version}-src.tar.gz
-Source1:       %{name}-1.3-optional.jar
-URL:           http://jakarta.apache.org
-BuildRequires: ibm-java-sdk
+Source0:       http://www.apache.org/dist/ant/source/apache-ant-%{version}-src.tar.bz2
+# Source0-md5: 3e1f06aae6b691543299ccb1a5cb038f
+Patch0:                %{name}-ANT_HOME.patch
+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 system
-Ant is used by apache jakarta&xml projects.
+Platform-independent build tool for Java. Ant is a Java based build
+system. Ant is used by apache jakarta & xml projects.
+
+%description -l pl
+Niezale¿ne od platformy narzêdzie do budowania w Javie. Ant jest
+u¿ywany przez projekty apache jakarta i xml.
 
 %package doc
-Group:                         Documentation
-Requires:              webserver
-Summary:               Online manual for ant
-Obsoletes:             ant-doc
+Summary:       Online manual for ant
+Summary(pl):   Dokumentacja online do ant
+Group:         Documentation
+Obsoletes:     ant-doc
 
 %description doc
-Documentation for ant, Platform-independent build tool for java.
-Used by Apache Group for jakarta and xml projects.
+Documentation for ant, platform-independent build tool for Java. Used
+by Apache Group for jakarta and xml projects.
+
+%description doc -l pl
+Dokumentacja do ant - niezale¿nego od platformy narzêdzia do budowania
+w Javie.
 
 %prep
-%setup -q
+%setup -q -n apache-ant-%{version}
+%patch0 -p1
 
 %build
-export JAVA_HOME="/usr/lib/IBMJava2-13"
-export CLASSPATH="$CLASSPATH:$JAVA_HOME/jre/lib/rt.jar"
-export CLASSPATH="$CLASSPATH:$RPM_BUILD_DIR/%{name}-%{version}/%{name}-1.3-optional.jar"
-cp %{SOURCE1} .
+if [ -z "$JAVA_HOME" ]; then
+       JAVA_HOME=/usr/lib/java
+fi
+export JAVA_HOME
+
 sh build.sh
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT/%{_bindir}
-install -d $RPM_BUILD_ROOT/%{_javalibdir}
-cp bootstrap/bin/{ant,antRun,runant.pl,runant.py} $RPM_BUILD_ROOT/%{_bindir}
-cp bootstrap/lib/*.jar $RPM_BUILD_ROOT/%{_javalibdir}
-
-ln -sf %{_javalibdir} $RPM_BUILD_ROOT/%{_javalibdir}/lib
+install -d $RPM_BUILD_ROOT%{_bindir}
+install -d $RPM_BUILD_ROOT%{_javaclassdir}
+install bootstrap/bin/{ant,antRun,runant.pl,runant.py} $RPM_BUILD_ROOT%{_bindir}
+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
 
-gzip -9nf KEYS LICENSE README WHATSNEW
+# this looks strange
+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)