[jline2] Do not import non-existing org.fusesource.jansi.internal package
Marek Goldmann
goldmann at fedoraproject.org
Fri Feb 1 10:06:42 UTC 2013
commit 1802d903cae54421166e90a9fd9cd18047a91d9f
Author: Marek Goldmann <marek.goldmann at gmail.com>
Date: Fri Feb 1 11:06:19 2013 +0100
Do not import non-existing org.fusesource.jansi.internal package
jline2.spec | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
---
diff --git a/jline2.spec b/jline2.spec
index d8fd9c5..c4a36a0 100644
--- a/jline2.spec
+++ b/jline2.spec
@@ -1,6 +1,6 @@
Name: jline2
Version: 2.10
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: JLine is a Java library for handling console input
Group: Development/Libraries
License: BSD and ASL 2.0
@@ -53,6 +53,10 @@ This package contains the API documentation for %{name}.
%pom_xpath_remove "pom:build/pom:extensions"
%pom_xpath_remove "pom:build/pom:pluginManagement/pom:plugins/pom:plugin[pom:artifactId = 'maven-site-plugin']"
+# Do not import non-existing internal package
+%pom_xpath_remove "pom:build/pom:plugins/pom:plugin[pom:artifactId = 'maven-bundle-plugin']/pom:executions/pom:execution/pom:configuration/pom:instructions/pom:Import-Package"
+%pom_xpath_inject "pom:build/pom:plugins/pom:plugin[pom:artifactId = 'maven-bundle-plugin']/pom:executions/pom:execution/pom:configuration/pom:instructions" "<Import-Package>javax.swing;resolution:=optional,!org.fusesource.jansi.internal</Import-Package>"
+
%build
mvn-rpmbuild install javadoc:aggregate
@@ -82,6 +86,9 @@ install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
%doc LICENSE.txt
%changelog
+* Fri Feb 01 2013 Marek Goldmann <mgoldman at redhat.com> - 2.10-2
+- Do not import non-existing org.fusesource.jansi.internal package
+
* Fri Feb 01 2013 Marek Goldmann <mgoldman at redhat.com> - 2.10-1
- Upstream release 2.10
- Removed patches, using pom macros now
More information about the scm-commits
mailing list