From 9310f7a8917255dffcc240fe6063c18053298d3a984fdb568815c6606623fb1f Mon Sep 17 00:00:00 2001
From: Michal Vyskocil <michal.vyskocil@gmail.com>
Date: Fri, 23 Aug 2013 09:30:16 +0000
Subject: [PATCH 1/2] - use new add_maven_depmap from javapackages-utils

OBS-URL: https://build.opensuse.org/package/show/Java:packages/jline?expand=0&rev=9
---
 jline.changes |  1 +
 jline.spec    | 39 +++++----------------------------------
 2 files changed, 6 insertions(+), 34 deletions(-)

diff --git a/jline.changes b/jline.changes
index 57e4a5c..e1dc9e6 100644
--- a/jline.changes
+++ b/jline.changes
@@ -2,6 +2,7 @@
 Thu Apr 25 09:21:43 UTC 2013 - mvyskocil@suse.com
 
 - add findutils dependency (bnc#816314) 
+- use new add_maven_depmap from javapackages-utils
 
 -------------------------------------------------------------------
 Thu Sep  2 12:32:48 UTC 2010 - mvyskocil@suse.cz
diff --git a/jline.spec b/jline.spec
index 5639b04..1ccc78a 100644
--- a/jline.spec
+++ b/jline.spec
@@ -84,17 +84,6 @@ chain to other console applications.
 
 
 
-%package        javadoc
-Summary:        Java library for reading and editing user input in console applications
-Group:          Development/Libraries/Java
-
-%description    javadoc
-JLine is a java library for reading and editing user input in console
-applications. It features tab-completion, command history, password
-masking, customizable keybindings, and pass-through handlers to use to
-chain to other console applications.
-
-
 
 %prep
 # BEWARE: The jar file META-INF is not under the subdir
@@ -126,7 +115,7 @@ mvn-jpp \
 %else
 export CLASSPATH=`pwd`/target/classes:`pwd`/target/test-classes
 export OPT_JAR_LIST=:
-ant jar javadoc
+ant jar
 %endif
 
 %install
@@ -134,34 +123,16 @@ ant jar javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
 install -p -m 644 src/target/jline.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
 (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} ${jar/-%{version}/}; done)
-%add_to_maven_depmap %{name} %{name} %{version} JPP %{name}
-# poms
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
-install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}.pom
-# javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr src/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
+# pom
+install -pD -T -m 644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
 
 %files
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}.jar
 %{_javadir}/%{name}-%{version}.jar
-%{_datadir}/maven2/poms/*
 %config %{_mavendepmapfragdir}/*
-
-%files javadoc
-%defattr(0644,root,root,0755)
-%{_javadocdir}/%{name}-%{version}
-%{_javadocdir}/%{name}
+%{_mavenpomdir}/*
 
 %changelog

From f1be3f366f92c362798b38666af62d17e9ab4fe7500f7ea9f5818f76928539f1 Mon Sep 17 00:00:00 2001
From: Michal Vyskocil <michal.vyskocil@gmail.com>
Date: Mon, 26 Aug 2013 07:58:13 +0000
Subject: [PATCH 2/2] fix changes file

OBS-URL: https://build.opensuse.org/package/show/Java:packages/jline?expand=0&rev=10
---
 jline.changes | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/jline.changes b/jline.changes
index e1dc9e6..9fb118c 100644
--- a/jline.changes
+++ b/jline.changes
@@ -1,8 +1,12 @@
+-------------------------------------------------------------------
+Mon Aug 26 07:57:51 UTC 2013 - mvyskocil@suse.com
+
+- use new add_maven_depmap from javapackages-utils
+
 -------------------------------------------------------------------
 Thu Apr 25 09:21:43 UTC 2013 - mvyskocil@suse.com
 
 - add findutils dependency (bnc#816314) 
-- use new add_maven_depmap from javapackages-utils
 
 -------------------------------------------------------------------
 Thu Sep  2 12:32:48 UTC 2010 - mvyskocil@suse.cz