[groovy] Fixed the build failure and updated the patch.
hannes
hannes at fedoraproject.org
Thu Oct 13 13:45:41 UTC 2011
commit 67d90f8e6396470656ac7e9b641285c8b49a737a
Author: hannes <hannes at fedoraproject.org>
Date: Thu Oct 13 15:45:47 2011 +0200
Fixed the build failure and updated the patch.
groovy-1.8.1-nojansi.patch | 30 ++++++++----------------------
groovy.spec | 2 +-
2 files changed, 9 insertions(+), 23 deletions(-)
---
diff --git a/groovy-1.8.1-nojansi.patch b/groovy-1.8.1-nojansi.patch
index b6fd395..2d6c535 100644
--- a/groovy-1.8.1-nojansi.patch
+++ b/groovy-1.8.1-nojansi.patch
@@ -23,7 +23,7 @@ diff --git a/src/main/org/codehaus/groovy/tools/shell/Groovysh.groovy b/src/main
index 0634d0f..28ac156 100644
--- a/src/main/org/codehaus/groovy/tools/shell/Groovysh.groovy
+++ b/src/main/org/codehaus/groovy/tools/shell/Groovysh.groovy
-@@ -20,12 +20,10 @@
+@@ -20,12 +20,11 @@
import jline.History
import org.codehaus.groovy.tools.shell.util.MessageSource
@@ -34,38 +34,24 @@ index 0634d0f..28ac156 100644
-import org.fusesource.jansi.AnsiRenderer
-import org.fusesource.jansi.Ansi
-import org.fusesource.jansi.AnsiConsole
++
/**
* An interactive shell for evaluating Groovy code from the command-line (aka. groovysh).
-@@ -36,13 +34,7 @@
- class Groovysh
- extends Shell
- {
+@@ -35,13 +34,6 @@
+ */
+ class Groovysh extends Shell {
+
- static {
- // Install the system adapters
- AnsiConsole.systemInstall()
-
+-
- // Register jline ansi detector
- Ansi.setDetector(new AnsiDetector())
- }
private static final MessageSource messages = new MessageSource(Groovysh.class)
-
-@@ -190,11 +182,13 @@
- //
- // Prompt
- //
-+
-+ private AnsiRenderer prompt = new AnsiRenderer()
-
- private String renderPrompt() {
- def lineNum = formatLineNumber(buffers.current().size())
-
-- return AnsiRenderer.render("@|bold groovy:|@${lineNum}@|bold >|@ ")
-+ return prompt.render("@|bold groovy:|@${lineNum}@|bold >|@ ")
- }
-
- /**
+
diff --git a/src/main/org/codehaus/groovy/tools/shell/IO.java b/src/main/org/codehaus/groovy/tools/shell/IO.java
index 0af559d..58633dc 100644
--- a/src/main/org/codehaus/groovy/tools/shell/IO.java
diff --git a/groovy.spec b/groovy.spec
index e8be3fa..27f1b1e 100644
--- a/groovy.spec
+++ b/groovy.spec
@@ -140,7 +140,7 @@ install -p -m644 pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-%{name}.pom
%{_mavendepmapfragdir}/*
%{_datadir}/maven2/poms/*
%config(noreplace) %{_sysconfdir}/*
-%doc LICENSE.txt NOTICE.txt README.txt
+%doc LICENSE.txt NOTICE.txt README.md
%files javadoc
More information about the scm-commits
mailing list