[joni] Updated to version 1.1.9.

[Bohuslav Kabrda]

commit aacefa2ee0a3ef58c413b40e0951d9722318af75
Author: Bohuslav Kabrda <bkabrda at redhat.com>
Date:   Tue Feb 26 15:52:10 2013 +0100

    Updated to version 1.1.9.
    
    - Switched from ant to maven.

 .gitignore                                         |    1 +
 ...lib_deps.patch => joni-add-build-lib-deps.patch |    0
 joni-remove-useless-wagon-dependency.patch         |   15 +++++++
 joni.spec                                          |   40 +++++++++++--------
 sources                                            |    2 +-
 5 files changed, 40 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index eaf8f41..4f3cc96 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 jruby-joni-bb99ccb.tar.gz
+/joni-1.1.9.tar.gz
diff --git a/add_build_lib_deps.patch b/joni-add-build-lib-deps.patch
similarity index 100%
rename from add_build_lib_deps.patch
rename to joni-add-build-lib-deps.patch
diff --git a/joni-remove-useless-wagon-dependency.patch b/joni-remove-useless-wagon-dependency.patch
new file mode 100644
index 0000000..6672d7c
--- /dev/null
+++ b/joni-remove-useless-wagon-dependency.patch
@@ -0,0 +1,15 @@
+--- pom.xml	2012-10-08 20:53:08.000000000 +0200
++++ pom.xml.orig	2013-02-26 15:43:53.961731353 +0100
+@@ -95,12 +95,6 @@
+     <sourceDirectory>src</sourceDirectory>
+     <testSourceDirectory>test</testSourceDirectory>
+     <finalName>joni</finalName>
+-    <extensions>
+-      <extension>
+-        <groupId>org.apache.maven.wagon</groupId>
+-        <artifactId>wagon-webdav</artifactId>
+-      </extension>
+-    </extensions>
+     <plugins>
+       <plugin>
+         <artifactId>maven-compiler-plugin</artifactId>
diff --git a/joni.spec b/joni.spec
index 507045c..3d62398 100644
--- a/joni.spec
+++ b/joni.spec
@@ -1,25 +1,28 @@
-%global  git_commit bb99ccb
-%global cluster jruby
-
 Name:             joni
-Version:          1.1.3
-Release:          9%{?dist}
+Version:          1.1.9
+Release:          1%{?dist}
 Summary:          Java port of Oniguruma regexp library 
 Group:            Development/Libraries
 License:          MIT
-URL:              http://github.com/%{cluster}/%{name}
-Source0:          %{url}/tarball/%{version}/%{cluster}-%{name}-%{git_commit}.tar.gz
-Patch0:           add_build_lib_deps.patch
+URL:              http://github.com/jruby/%{name}
+Source0:          https://github.com/jruby/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Patch0:           joni-add-build-lib-deps.patch
+Patch1:           joni-remove-useless-wagon-dependency.patch
 
-BuildRequires:    ant
-BuildRequires:    java-devel >= 1.5
+BuildRequires:    java-devel
 BuildRequires:    jcodings
 BuildRequires:    jpackage-utils
+BuildRequires:    junit
+BuildRequires:    maven-local
+BuildRequires:    maven-compiler-plugin
+BuildRequires:    maven-jar-plugin
+BuildRequires:    maven-surefire-plugin
 BuildRequires:    objectweb-asm
-Requires:         java >= 1.5
+
+Requires:         java
+Requires:         jcodings
 Requires:         jpackage-utils
 Requires:         objectweb-asm
-Requires:         jcodings
 
 BuildArch:      noarch
 
@@ -29,8 +32,9 @@ joni is a port of Oniguruma, a regular expressions library,
 to java. It is used by jruby.
 
 %prep
-%setup -q -n jruby-%{name}-bb99ccb
+%setup -q
 %patch0 -p0
+%patch1 -p0
 
 find ./ -name '*.jar' -delete
 find ./ -name '*.class' -delete
@@ -39,10 +43,9 @@ mkdir build_lib
 build-jar-repository -s -p build_lib objectweb-asm/asm jcodings
 
 %build
-ant build
+mvn-rpmbuild install javadoc:aggregate
 
 %install
-
 install -d -m 755 %{buildroot}%{_javadir}
 install -m 644 target/%{name}.jar %{buildroot}%{_javadir}/%{name}.jar
 
@@ -56,13 +59,16 @@ sed -i -e 's|\r||' test/org/joni/test/TestU.java
 sed -i -e 's|\r||' test/org/joni/test/TestA.java
 
 %files
+%doc MANIFEST.MF
 %{_javadir}/%{name}.jar
 %{_mavenpomdir}/*
 %{_mavendepmapfragdir}/*
-%doc build.xml
-%doc test
 
 %changelog
+* Tue Feb 26 2013 Bohuslav Kabrda <bkabrda at redhat.com> - 1.1.9-1
+- Updated to version 1.1.9.
+- Switched from ant to maven.
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.3-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/sources b/sources
index 5010880..d01025f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f9adef877a452809d89da46c9c51f640  jruby-joni-bb99ccb.tar.gz
+b50759274ae2e5b6fa2d3f1d93dc2ec7  joni-1.1.9.tar.gz