[groovy] removed the nojansi patch since it's in fedora

[hannes]

commit 4751e03faa7afde89955d77d57ed9a89c8383fe2
Author: hannes <hannes at fedoraproject.org>
Date:   Thu Oct 13 17:30:37 2011 +0200

    removed the nojansi patch since it's in fedora

 groovy-1.8.1-nojansi.patch |  629 --------------------------------------------
 groovy.spec                |   12 +-
 2 files changed, 8 insertions(+), 633 deletions(-)
---
diff --git a/groovy.spec b/groovy.spec
index 27f1b1e..70df27e 100644
--- a/groovy.spec
+++ b/groovy.spec
@@ -4,7 +4,7 @@
 
 Name:           groovy
 Version:        1.8.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Dynamic language for the Java Platform
 
 Group:          Development/Languages
@@ -14,7 +14,6 @@ Source0:        http://dist.groovy.codehaus.org/distributions/%{name}-src-%{vers
 Source1:        groovy-script
 Source2:        groovy-starter.conf
 Source3:        groovy.desktop
-Patch1:         groovy-1.8.1-nojansi.patch
 BuildArch:      noarch
 
 BuildRequires:  ant
@@ -23,6 +22,7 @@ BuildRequires:  ant-antlr
 BuildRequires:  objectweb-asm
 BuildRequires:  bsf
 BuildRequires:  apache-ivy
+BuildRequires:  jansi
 BuildRequires:  jline
 BuildRequires:  jsp21
 BuildRequires:  junit
@@ -45,6 +45,7 @@ Requires:       bsf
 Requires:       apache-commons-cli
 Requires:       apache-commons-logging
 Requires:       ivy
+Requires:       jansi
 Requires:       jline
 Requires:       jsp21
 Requires:       junit
@@ -71,7 +72,6 @@ JavaDoc documentation for %{name}
 
 %prep
 %setup -q
-%patch1 -p1 -b .jansi
 
 
 %build
@@ -82,7 +82,8 @@ build-jar-repository target/lib/compile servlet jsp \
         objectweb-asm/asm-tree objectweb-asm/asm \
         objectweb-asm/asm-util objectweb-asm/asm-analysis \
         antlr ant/ant-antlr antlr \
-        bsf jline xstream ant junit ivy commons-cli
+        bsf jline xstream ant junit ivy commons-cli \
+        jansi
 
 # Build
 # TODO: Build at least tests, maybe examples
@@ -157,6 +158,9 @@ install -p -m644 pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-%{name}.pom
 
 
 %changelog
+* Thu Oct 13 2011 Johannes Lips <hannes at fedoraproject.org> - 1.8.3-2
+- remove the nojansi patch since jansi is in fedora
+
 * Thu Oct 13 2011 Johannes Lips <hannes at fedoraproject.org> - 1.8.3-1
 - Update to 1.8.3