Attachment 581958 Details for Bug 818753 – JLine 2.6 patch

[patch] JLine 2.6 patch

jline-2.6.patch (text/plain), 4.36 KB, created by Roman Kennke on 2012-05-03 20:43:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Roman Kennke

Created: 2012-05-03 20:43:22 UTC

Size: 4.36 KB

patch

obsolete

>diff --git a/jline2-2.5-pom.patch b/jline2-2.5-pom.patch
>deleted file mode 100644
>index 7467921..0000000
>--- a/jline2-2.5-pom.patch
>+++ /dev/null
>@@ -1,28 +0,0 @@
>-diff -Naur jline-2.5/pom.xml jline-2.5-work/pom.xml
>---- jline-2.5/pom.xml	2010-11-12 13:00:49.000000000 -0500
>-+++ jline-2.5-work/pom.xml	2011-05-31 01:42:53.140177974 -0400
>-@@ -200,7 +200,7 @@
>-             </plugin>
>- 
>-             
>--            <plugin>
>-+
>-         </plugins>
>-     </build>
>- 
>-@@ -270,4 +270,4 @@
>-         </profile>
>-     </profiles>
>- 
>--</project>
>-\ No newline at end of file
>-+</project>
>diff --git a/jline2-2.5-protected-void-back.patch b/jline2-2.5-protected-void-back.patch
>deleted file mode 100644
>index eda39e0..0000000
>--- a/jline2-2.5-protected-void-back.patch
>+++ /dev/null
>@@ -1,12 +0,0 @@
>-diff -up jline-2.5/src/main/java/jline/console/ConsoleReader.java.org jline-2.5/src/main/java/jline/console/ConsoleReader.java
>---- jline-2.5/src/main/java/jline/console/ConsoleReader.java.org	2011-11-03 21:27:38.242789068 +0100
>-+++ jline-2.5/src/main/java/jline/console/ConsoleReader.java	2011-11-03 21:28:47.027460246 +0100
>-@@ -579,7 +579,7 @@ public class ConsoleReader
>-     /**
>-      * Move the visual cursor backwards without modifying the buffer cursor.
>-      */
>--    private void back(final int num) throws IOException {
>-+    protected void back(final int num) throws IOException {
>-         if (num == 0) return;
>-         if (terminal.isAnsiSupported()) {
>-             int width = getTerminal().getWidth();
>diff --git a/jline2-pom.patch b/jline2-pom.patch
>new file mode 100644
>index 0000000..7467921
>--- /dev/null
>+++ b/jline2-pom.patch
>@@ -0,0 +1,28 @@
>+diff -Naur jline-2.5/pom.xml jline-2.5-work/pom.xml
>+--- jline-2.5/pom.xml	2010-11-12 13:00:49.000000000 -0500
>++++ jline-2.5-work/pom.xml	2011-05-31 01:42:53.140177974 -0400
>+@@ -200,7 +200,7 @@
>+             </plugin>
>+ 
>+             
>+-            <plugin>
>++
>+         </plugins>
>+     </build>
>+ 
>+@@ -270,4 +270,4 @@
>+         </profile>
>+     </profiles>
>+ 
>+-</project>
>+\ No newline at end of file
>++</project>
>diff --git a/jline2.spec b/jline2.spec
>index 8d3e662..8c01102 100644
>--- a/jline2.spec
>+++ b/jline2.spec
>@@ -1,16 +1,15 @@
> Name:             jline2
>-Version:          2.5
>-Release:          5%{?dist}
>+Version:          2.6
>+Release:          1%{?dist}
> Summary:          JLine is a Java library for handling console input
> Group:            Development/Libraries
> License:          BSD and ASL 2.0
> URL:              https://github.com/jline/jline2
> 
> # git clone git://github.com/jline/jline2.git
>-# cd jline2/ && git archive --format=tar --prefix=jline-2.5/ jline-2.5 | xz > jline-2.5.tar.xz
>+# cd jline2/ && git archive --format=tar --prefix=jline-2.6/ jline-2.6 | xz > jline-2.6.tar.xz
> Source0:          jline-%{version}.tar.xz
>-Patch0:           %{name}-%{version}-pom.patch
>-Patch1:           %{name}-%{version}-protected-void-back.patch
>+Patch0:           %{name}-pom.patch
> 
> BuildArch:        noarch
> 
>@@ -48,7 +47,6 @@ This package contains the API documentation for %{name}.
> %prep
> %setup -q -n jline-%{version}
> %patch0 -p1
>-%patch1 -p1
> 
> %build
> mvn-rpmbuild install javadoc:aggregate
>@@ -79,6 +77,9 @@ install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
> %doc LICENSE.txt
> 
> %changelog
>+* Thu May 03 2012 Roman Kennke <rkennke@redhat.com> - 2.6-1
>+- Updated to 2.6 upstream release
>+
> * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.5-5
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
>

Actions: View | Diff

Attachments on bug 818753: 581958