Attachment 631389 Details for Bug 868291 – git formatted patch

[patch] git formatted patch

0001-Fix-OSGi-Import-Package-header.patch (text/plain), 2.63 KB, created by Severin Gehwolf on 2012-10-22 10:35:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Severin Gehwolf

Created: 2012-10-22 10:35:23 UTC

Size: 2.63 KB

patch

obsolete

>From 2ef7987fe3ee29458af430463a2bcc0e75f46133 Mon Sep 17 00:00:00 2001
>From: Severin Gehwolf <sgehwolf@redhat.com>
>Date: Fri, 19 Oct 2012 14:27:10 +0200
>Subject: [PATCH] Fix OSGi Import-Package header
>
>It was importing org.fusesource.jansi.internal which does not exist and
>if anything would only contain Windows related things.
>---
> jline2-2.5-pom.patch | 14 +++++++++++---
> jline2.spec          |  9 ++++++---
> 2 files changed, 17 insertions(+), 6 deletions(-)
>
>diff --git a/jline2-2.5-pom.patch b/jline2-2.5-pom.patch
>index 7467921..5ea81a7 100644
>--- a/jline2-2.5-pom.patch
>+++ b/jline2-2.5-pom.patch
>@@ -1,6 +1,14 @@
>-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
>+--- pom.xml.orig	2010-11-12 19:00:49.000000000 +0100
>++++ pom.xml	2012-10-19 14:18:50.000000000 +0200
>+@@ -167,7 +167,7 @@
>+                         </goals>
>+                         <configuration>
>+                             <instructions>
>+-                                <Import-Package>!jline*,javax.swing;resolution:=optional,*</Import-Package>
>++                                <Import-Package>!jline*,javax.swing;resolution:=optional,!org.fusesource.jansi.internal,*</Import-Package>
>+                                 <DynamicImport-Package>*</DynamicImport-Package>
>+                             </instructions>
>+                         </configuration>
> @@ -200,7 +200,7 @@
>              </plugin>
>  
>diff --git a/jline2.spec b/jline2.spec
>index 65af730..93ce3d1 100644
>--- a/jline2.spec
>+++ b/jline2.spec
>@@ -1,6 +1,6 @@
> Name:             jline2
> Version:          2.5
>-Release:          6%{?dist}
>+Release:          7%{?dist}
> Summary:          JLine is a Java library for handling console input
> Group:            Development/Libraries
> License:          BSD and ASL 2.0
>@@ -47,7 +47,7 @@ This package contains the API documentation for %{name}.
> 
> %prep
> %setup -q -n jline-%{version}
>-%patch0 -p1
>+%patch0
> %patch1 -p1
> 
> %build
>@@ -79,6 +79,10 @@ install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
> %doc LICENSE.txt
> 
> %changelog
>+* Fri Oct 19 2012 Severin Gehwolf <sgehwolf@redhat.com> 2.5-7
>+- Fix OSGi Import-Package header so as to not import non existing
>+  org.fusesource.jansi.internal package.
>+
> * Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.5-6
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
> 
>@@ -97,4 +101,3 @@ install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
> 
> * Tue May 31 2011 Marek Goldmann <mgoldman@redhat.com> 2.5-1
> - Initial packaging
>-
>-- 
>1.7.11.7
>

Actions: View | Diff

Attachments on bug 868291: 630009 | 631389