rpms/joni/devel joni-include-objectweb-asm.patch, NONE, 1.1 joni.spec, 1.7, 1.8

[Conrad Meyer]

Author: konradm

Update of /cvs/pkgs/rpms/joni/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24649

Modified Files:
	joni.spec 
Added Files:
	joni-include-objectweb-asm.patch 
Log Message:
Add objectweb-asm dependency/patch.

joni-include-objectweb-asm.patch:

--- NEW FILE joni-include-objectweb-asm.patch ---
--- build.xml.orig	2008-09-02 09:16:39.000000000 -0700
+++ build.xml	2008-09-02 09:26:49.000000000 -0700
@@ -5,20 +5,25 @@
     <property name="ant.build.javac.source" value="1.5" />
     <property name="src.dir" value="src" />
     <property name="bin.dir" value="target/classes" />
     <property name="dist.dir" value="target" />
     <property name="jar.name" value="joni.jar" />
+    <path id="lib.dir">
+	<pathelement location="build_lib/objectweb-asm_asm.jar" />
+    </path>
 
     <target name="clean">
         <delete dir="${bin.dir}" />
         <delete dir="${dist.dir}" />
 
     </target>
 
     <target name="compile">
         <mkdir dir="${bin.dir}" />
-        <javac srcdir="${src.dir}" destdir="${bin.dir}"/>
+	<javac srcdir="${src.dir}" destdir="${bin.dir}">
+	    <classpath refid="lib.dir" />
+        </javac>
     </target>
     
     <target name="build" depends="compile">
         <mkdir dir="${dist.dir}" />
 


Index: joni.spec
===================================================================
RCS file: /cvs/pkgs/rpms/joni/devel/joni.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- joni.spec	1 Sep 2008 05:26:03 -0000	1.7
+++ joni.spec	2 Sep 2008 16:30:34 -0000	1.8
@@ -11,12 +11,17 @@
 #   tar -cjf joni-1.0.3.tar.bz2 joni-1.0.3
 Source0:          %{name}-%{version}.tar.bz2
 Patch0:           joni-set-java-5_0-target-and-source.patch
+Patch1:           joni-include-objectweb-asm.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:    java-devel >= 1.5
 BuildRequires:    ant
+BuildRequires:    objectweb-asm
+BuildRequires:    junit
 BuildRequires:    jpackage-utils
 Requires:         java >= 1.5
+Requires:         objectweb-asm
+Requires:         junit
 Requires:         jpackage-utils
 
 #%if 0%{?fedora} > 9
@@ -36,6 +41,9 @@
 %prep
 %setup -q
 %patch0 -p0
+%patch1 -p0
+mkdir build_lib
+build-jar-repository -s -p build_lib objectweb-asm/asm
 
 
 %build