Author: glen Date: Tue Apr 17 23:08:18 2007 GMT Module: SPECS Tag: ANT-1_5 ---- Log message: - try ant 1.5.1
---- Files affected: SPECS: ant.spec (1.11.2.1 -> 1.11.2.1.2.1) ---- Diffs: ================================================================ Index: SPECS/ant.spec diff -u SPECS/ant.spec:1.11.2.1 SPECS/ant.spec:1.11.2.1.2.1 --- SPECS/ant.spec:1.11.2.1 Wed Apr 18 00:43:31 2007 +++ SPECS/ant.spec Wed Apr 18 01:08:11 2007 @@ -1,23 +1,23 @@ # $Revision$, $Date$ +%include /usr/lib/rpm/macros.java Summary: ant build tool for Java Summary(pl): ant - narzędzie do budowania w Javie Name: jakarta-ant -Version: 1.4.1 -Release: 4 +Version: 1.5.1 +Release: 0.1 License: Apache Group: Development/Languages/Java Source0: http://archive.apache.org/dist/ant/source/%{name}-%{version}-src.zip -# Source0-md5: e6bbfcfd3934ff19903d905821582fe4 -Source1: http://jakarta.apache.org/builds/jakarta-ant/release/v%{version}/bin/%{name}-%{version}-optional.jar -# Source1-md5: 319583f83c98e7c9db4d73b2d1122d76 -Patch0: %{name}-ANT_HOME.patch +# Source0-md5: 9559f9a3b6f110dd9f297e604d00c22c URL: http://jakarta.apache.org/ant/ BuildRequires: jdk +BuildRequires: rpm-javaprov +BuildRequires: rpmbuild(macros) >= 1.300 Requires: jdk BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _javalibdir /usr/share/java +%define _javadir /usr/share/java %description Platform-independent build tool for Java. Ant is a Java based build @@ -43,28 +43,22 @@ %prep %setup -q -%patch0 -p1 %build -if [ -z "$JAVA_HOME" ]; then - JAVA_HOME=%{_libdir}/java -fi -CLASSPATH="$JAVA_HOME/jre/lib/rt.jar:%{SOURCE1}" -export JAVA_HOME CLASSPATH +export JAVA_HOME="%{java_home}" -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%{_javadir} install bootstrap/bin/{ant,antRun,runant.pl,runant.py} $RPM_BUILD_ROOT%{_bindir} -install bootstrap/lib/*.jar $RPM_BUILD_ROOT%{_javalibdir} +install bootstrap/lib/*.jar $RPM_BUILD_ROOT%{_javadir} # this looks strange -ln -sf . $RPM_BUILD_ROOT%{_javalibdir}/lib +ln -sf . $RPM_BUILD_ROOT%{_javadir}/lib %clean rm -rf $RPM_BUILD_ROOT @@ -76,8 +70,8 @@ %attr(755,root,root) %{_bindir}/antRun %attr(755,root,root) %{_bindir}/runant.pl %attr(755,root,root) %{_bindir}/runant.py -%{_javalibdir}/lib -%{_javalibdir}/*.jar +%{_javadir}/lib +%{_javadir}/*.jar %files doc %defattr(644,root,root,755) @@ -89,6 +83,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.11.2.1.2.1 2007/04/17 23:08:11 glen +- try ant 1.5.1 + Revision 1.11.2.1 2007/04/17 22:43:31 glen - try building ant-1.4.1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ant.spec?r1=1.11.2.1&r2=1.11.2.1.2.1&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
