Author: glen                         Date: Tue Apr 17 23:22:24 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- builds now

---- Files affected:
SPECS:
   objectweb-anttask.spec (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SPECS/objectweb-anttask.spec
diff -u SPECS/objectweb-anttask.spec:1.5 SPECS/objectweb-anttask.spec:1.6
--- SPECS/objectweb-anttask.spec:1.5    Mon Feb 12 23:09:10 2007
+++ SPECS/objectweb-anttask.spec        Wed Apr 18 01:22:19 2007
@@ -1,4 +1,5 @@
 # $Revision$, $Date$
+%include       /usr/lib/rpm/macros.java
 Summary:       ObjectWeb Ant task
 Summary(pl.UTF-8):     Zadanie Anta ObjectWeb
 Name:          objectweb-anttask
@@ -6,11 +7,16 @@
 Release:       0.1
 License:       LGPL
 Group:         Development/Languages/Java
-Source0:       
http://download.forge.objectweb.org/monolog/ow_util_ant_tasks_1.2.zip
+Source0:       
http://download.forge.objectweb.org/monolog/ow_util_ant_tasks_%{version}.zip
 # Source0-md5: 59ec69d435aedeeb710229fddf5fd34c
 URL:           http://forge.objectweb.org/projects/monolog/
 BuildRequires: ant
+Patch0:                %{name}-source.patch
 BuildRequires: jdk
+BuildRequires: jpackage-utils
+BuildRequires: rpm-javaprov
+BuildRequires: rpmbuild(macros) >= 1.300
+BuildRequires: xalan-j
 #Provides:     owanttask
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -23,29 +29,30 @@
 
 %prep
 %setup -c -q -n %{name}
-find . -name "*.class" -exec rm {} \;
-find . -name "*.jar" -exec rm {} \;
+%patch0 -p1
+find -name '*.class' -o -name '*.jar' | xargs rm -rf
 
 %build
-[ -z "$JAVA_HOME" ] && export JAVA_HOME=%{_jvmdir}/java
-export CLASSPATH=
-ant -Dbuild.compiler=modern jar
+required_jars="xalan"
+export CLASSPATH=$(build-classpath $required_jars)
+%ant jar \
+       -Dcompile.source=1.4 \
+       -Dbuild.compiler=modern
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 # jars
 install -d $RPM_BUILD_ROOT%{_javadir}
-
 install output/lib/ow_util_ant_tasks.jar 
$RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-ln -sf %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}%{name}.jar
+ln -sf %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%{_javadir}/*
+%{_javadir}/*.jar
 
 %define date   %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -53,6 +60,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2007/04/17 23:22:19  glen
+- builds now
+
 Revision 1.5  2007/02/12 22:09:10  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/objectweb-anttask.spec?r1=1.5&r2=1.6&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to