[jline2] Upstream release 2.10

[Marek Goldmann]

commit f090b3c6f0ce6cec932429cd374180f925cc112d
Author: Marek Goldmann <marek.goldmann at gmail.com>
Date:   Fri Feb 1 10:50:27 2013 +0100

    Upstream release 2.10

 .gitignore                           |    1 +
 jline2-2.5-pom.patch                 |   36 ----------------------------------
 jline2-2.5-protected-void-back.patch |   12 -----------
 jline2.spec                          |   23 ++++++++++++++-------
 sources                              |    2 +-
 5 files changed, 17 insertions(+), 57 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 62baf4f..36fbdd9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /jline-2.5.tar.xz
+/jline-2.10.tar.xz
diff --git a/jline2.spec b/jline2.spec
index 93ce3d1..d8fd9c5 100644
--- a/jline2.spec
+++ b/jline2.spec
@@ -1,16 +1,14 @@
 Name:             jline2
-Version:          2.5
-Release:          7%{?dist}
+Version:          2.10
+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.10/ jline-2.10 | xz > jline-2.10.tar.xz
 Source0:          jline-%{version}.tar.xz
-Patch0:           %{name}-%{version}-pom.patch
-Patch1:           %{name}-%{version}-protected-void-back.patch
 
 BuildArch:        noarch
 
@@ -47,8 +45,13 @@ This package contains the API documentation for %{name}.
 
 %prep
 %setup -q -n jline-%{version}
-%patch0
-%patch1 -p1
+
+# Remove maven-shade-plugin usage
+%pom_remove_plugin "org.apache.maven.plugins:maven-shade-plugin"
+
+# Remove unavailable and unneeded deps
+%pom_xpath_remove "pom:build/pom:extensions"
+%pom_xpath_remove "pom:build/pom:pluginManagement/pom:plugins/pom:plugin[pom:artifactId = 'maven-site-plugin']"
 
 %build
 mvn-rpmbuild install javadoc:aggregate
@@ -72,13 +75,17 @@ install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
 %{_mavenpomdir}/*
 %{_mavendepmapfragdir}/*
 %{_javadir}/*
-%doc README.md LICENSE.txt
+%doc CHANGELOG.md README.md LICENSE.txt
 
 %files javadoc
 %{_javadocdir}/%{name}
 %doc LICENSE.txt
 
 %changelog
+* Fri Feb 01 2013 Marek Goldmann <mgoldman at redhat.com> - 2.10-1
+- Upstream release 2.10
+- Removed patches, using pom macros now
+
 * Fri Oct 19 2012 Severin Gehwolf <sgehwolf at redhat.com> 2.5-7
 - Fix OSGi Import-Package header so as to not import non existing
   org.fusesource.jansi.internal package.
diff --git a/sources b/sources
index d797f25..a016557 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-06eb131df117aec260d08b720745ec6b  jline-2.5.tar.xz
+621dd4d65e5b67b1468f2666a7fa1fb8  jline-2.10.tar.xz