Author: qboosh Date: Mon Jan 14 21:36:42 2008 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.3.2 - removed obsolete source patch, added ant patch - build using bundled asm-2.1 to avoid chicken-egg problem
---- Files affected: SPECS: objectweb-anttask.spec (1.7 -> 1.8) ---- Diffs: ================================================================ Index: SPECS/objectweb-anttask.spec diff -u SPECS/objectweb-anttask.spec:1.7 SPECS/objectweb-anttask.spec:1.8 --- SPECS/objectweb-anttask.spec:1.7 Mon Jan 14 21:46:05 2008 +++ SPECS/objectweb-anttask.spec Mon Jan 14 22:36:37 2008 @@ -3,20 +3,21 @@ Summary: ObjectWeb Ant task Summary(pl.UTF-8): Zadanie Anta ObjectWeb Name: objectweb-anttask -Version: 1.2 +Version: 1.3.2 Release: 0.1 License: LGPL Group: Development/Languages/Java Source0: http://download.forge.objectweb.org/monolog/ow_util_ant_tasks_%{version}.zip -# Source0-md5: 59ec69d435aedeeb710229fddf5fd34c -Patch0: %{name}-source.patch +# Source0-md5: cd602bf75a0feab480fa97739955b84e +Patch0: %{name}-ant.patch URL: http://forge.objectweb.org/projects/monolog/ -BuildRequires: ant +BuildRequires: ant >= 1.7 BuildRequires: jdk BuildRequires: jpackage-utils BuildRequires: rpm-javaprov BuildRequires: rpmbuild(macros) >= 1.300 BuildRequires: xalan-j +Requires: ant >= 1.7 #Provides: owanttask BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -30,13 +31,15 @@ %prep %setup -c -q -n %{name} %patch0 -p1 -find -name '*.class' -o -name '*.jar' | xargs rm -rf + +find output -name '*.class' | xargs rm -f +rm externals/ant.jar %build +# use bundled asm-2.1 for build to avoid loop (asm2 BR: objectweb-anttask) required_jars="xalan" -export CLASSPATH=$(build-classpath $required_jars) +export CLASSPATH="$(build-classpath $required_jars):externals/asm-2.1.jar" %ant jar \ - -Dcompile.source=1.4 \ -Dbuild.compiler=modern %install @@ -60,6 +63,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.8 2008-01-14 21:36:37 qboosh +- updated to 1.3.2 +- removed obsolete source patch, added ant patch +- build using bundled asm-2.1 to avoid chicken-egg problem + Revision 1.7 2008-01-14 20:46:05 qboosh - unified ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/objectweb-anttask.spec?r1=1.7&r2=1.8&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
