[jline] Crosslink with local javadocs, include LICENSE.txt in -javadoc.

[Ville Skyttä]

commit 0f74cf12538cf970f2f4aa217ad35f6423870d64
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Sat Oct 15 22:40:35 2011 +0300

    Crosslink with local javadocs, include LICENSE.txt in -javadoc.

 jline-0.9.94-crosslink.patch |   12 ++++++++++++
 jline.spec                   |    8 +++++++-
 2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/jline-0.9.94-crosslink.patch b/jline-0.9.94-crosslink.patch
new file mode 100644
index 0000000..3534dd4
--- /dev/null
+++ b/jline-0.9.94-crosslink.patch
@@ -0,0 +1,12 @@
+diff -up jline-0.9.94/src/pom.xml~ jline-0.9.94/src/pom.xml
+--- jline-0.9.94/src/pom.xml~	2008-02-22 03:00:58.000000000 +0200
++++ jline-0.9.94/src/pom.xml	2011-10-15 22:34:00.642269743 +0300
+@@ -164,7 +164,7 @@ To make a bundle and request that ibilio
+           <aggregate>true</aggregate>
+           <linksource>true</linksource>
+           <links>
+-            <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
++            <link>/usr/share/javadoc/java</link>
+           </links>
+         </configuration>
+       </plugin>
diff --git a/jline.spec b/jline.spec
index 64855ee..5a5b48e 100644
--- a/jline.spec
+++ b/jline.spec
@@ -38,6 +38,7 @@ Group:          Development/Libraries
 Source0:        http://download.sourceforge.net/sourceforge/jline/jline-%{version}.zip
 Source1:        CatalogManager.properties
 Patch0:         %{name}-0.9.94-keybindings.patch
+Patch1:         %{name}-0.9.94-crosslink.patch
 
 Requires:      bash
 # for /bin/stty
@@ -56,6 +57,7 @@ BuildRequires: maven-resources-plugin
 BuildRequires: maven-site-plugin
 BuildRequires: maven-surefire-plugin
 BuildRequires: maven-surefire-provider-junit
+BuildRequires: java-javadoc
 
 BuildArch:     noarch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -77,7 +79,7 @@ Demonstrations and samples for %{name}.
 %package        javadoc
 Summary:        Javadoc for %{name}
 Group:          Documentation
-Requires:       jpackage-utils
+Requires:       java-javadoc
 
 %description    javadoc
 Javadoc for %{name}.
@@ -85,6 +87,7 @@ Javadoc for %{name}.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 # Make sure upstream hasn't sneaked in any jars we don't know about
 find -name '*.class' -exec rm -f '{}' \;
@@ -155,6 +158,7 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 
 %files javadoc
 %defattr(-,root,root,-)
+%doc LICENSE.txt
 %{_javadocdir}/*
 
 %changelog
@@ -162,6 +166,8 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 - Patch delete to actually behave as delete instead of backspace, include
   keybindings.properties in docs (#720170).
 - Drop executable bit from jar.
+- Crosslink with local javadocs.
+- Include LICENSE.txt in -javadoc.
 
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.94-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild