rpms/joni/F-10 joni-1.1.1-include-all-build_lib.diff, NONE, 1.1 .cvsignore, 1.3, 1.4 joni.spec, 1.8, 1.9 sources, 1.4, 1.5

[Conrad Meyer]

Author: konradm

Update of /cvs/pkgs/rpms/joni/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13117

Modified Files:
	.cvsignore joni.spec sources 
Added Files:
	joni-1.1.1-include-all-build_lib.diff 
Log Message:
Build joni 1.1.2 for F-10.

joni-1.1.1-include-all-build_lib.diff:

--- NEW FILE joni-1.1.1-include-all-build_lib.diff ---
--- build.xml.orig	2008-11-28 23:17:02.000000000 -0800
+++ build.xml	2008-11-28 23:20:56.000000000 -0800
@@ -6,11 +6,11 @@
     <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" />
+	<fileset dir="build_lib" includes="*.jar" />
     </path>
 
     <target name="clean">
         <delete dir="${bin.dir}" />
         <delete dir="${dist.dir}" />


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/joni/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	19 Jul 2008 10:24:44 -0000	1.3
+++ .cvsignore	16 Feb 2009 12:28:17 -0000	1.4
@@ -1 +1 @@
-joni-1.0.3.tar.bz2
+joni-1.1.2.tar.bz2


Index: joni.spec
===================================================================
RCS file: /cvs/pkgs/rpms/joni/F-10/joni.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- joni.spec	2 Sep 2008 16:30:34 -0000	1.8
+++ joni.spec	16 Feb 2009 12:28:17 -0000	1.9
@@ -1,5 +1,5 @@
 Name:             joni
-Version:          1.0.3
+Version:          1.1.2
 Release:          1%{?dist}
 Summary:          Java regular expression library
 Group:            Development/Libraries
@@ -12,17 +12,19 @@
 Source0:          %{name}-%{version}.tar.bz2
 Patch0:           joni-set-java-5_0-target-and-source.patch
 Patch1:           joni-include-objectweb-asm.patch
+Patch2:           joni-1.1.1-include-all-build_lib.diff
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:    java-devel >= 1.5
 BuildRequires:    ant
-BuildRequires:    objectweb-asm
-BuildRequires:    junit
+BuildRequires:    java-devel >= 1.5
+BuildRequires:    jcodings
 BuildRequires:    jpackage-utils
+BuildRequires:    junit
+BuildRequires:    objectweb-asm
 Requires:         java >= 1.5
-Requires:         objectweb-asm
-Requires:         junit
 Requires:         jpackage-utils
+Requires:         junit
+Requires:         objectweb-asm
 
 #%if 0%{?fedora} > 9
 #BuildArch:        noarch
@@ -42,8 +44,9 @@
 %setup -q
 %patch0 -p0
 %patch1 -p0
+%patch2
 mkdir build_lib
-build-jar-repository -s -p build_lib objectweb-asm/asm
+build-jar-repository -s -p build_lib objectweb-asm/asm jcodings
 
 
 %build
@@ -96,6 +99,12 @@
 
 
 %changelog
+* Fri Dec 12 2008 Conrad Meyer <konrad at tylerc.org> - 1.1.2-1
+- Bump to 1.1.2.
+
+* Fri Nov 28 2008 Conrad Meyer <konrad at tylerc.org> - 1.1.1-1
+- Bump to 1.1.1.
+
 * Sun Aug 31 2008 Conrad Meyer <konrad at tylerc.org> - 1.0.3-1
 - Official 1.0.3 release.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/joni/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	1 Sep 2008 05:26:03 -0000	1.4
+++ sources	16 Feb 2009 12:28:17 -0000	1.5
@@ -1 +1 @@
-ae4a27000393bdac2f07b21adf46275d  joni-1.0.3.tar.bz2
+bf5ea31f0eb1eeb39f1ba7fa2bec782c  joni-1.1.2.tar.bz2