[kawa] Mark -javadoc as noarch. Explicitly requires java-headless.

[Christopher Meng]

commit 40cd7673be158b732d27aed8bed19aa2c4085467
Author: Christopher Meng <i at cicku.me>
Date:   Thu Jul 10 00:07:52 2014 +0800

    Mark -javadoc as noarch.
    Explicitly requires java-headless.

 kawa.spec |   21 ++++++++++++++-------
 1 files changed, 14 insertions(+), 7 deletions(-)
---
diff --git a/kawa.spec b/kawa.spec
index 07bf90d..f4926cf 100644
--- a/kawa.spec
+++ b/kawa.spec
@@ -1,7 +1,7 @@
 Name:           kawa
 Epoch:          1
 Version:        1.14
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Kawa scheme implementation
 License:        MIT
 URL:            http://www.gnu.org/software/kawa/
@@ -17,6 +17,9 @@ BuildRequires:  servlet3
 BuildRequires:  texinfo
 BuildRequires:  util-linux-ng
 Requires:       servlet3
+Requires:       java-headless
+Requires(post): info
+Requires(preun): info
 
 %description
 Kawa is an implementation of the Scheme programming language.  It is
@@ -26,6 +29,7 @@ script.
 
 %package        javadoc
 Summary:        Javadoc for %{name}
+BuildArch:      noarch
 Requires:       %{name} = %{epoch}:%{version}-%{release}
 Requires:       jpackage-utils
 
@@ -36,7 +40,8 @@ Requires:       jpackage-utils
 %setup -q
 
 %build
-%configure --enable-kawa-frontend --with-java-source=1.7.0 \
+%configure --enable-kawa-frontend \
+           --with-java-source=1.7.0 \
            --with-servlet=$(build-classpath tomcat-servlet-3.0-api) \
            --with-libtool
 export CLASSPATH=$(build-classpath servlet antlr)
@@ -49,18 +54,17 @@ cp -p doc/qexo.man doc/qexo.1
 
 %install
 %make_install install-javadoc-html JAVA=%{_bindir}/java JAVADOC_DIR=%{buildroot}%{_javadocdir}/%{name}
-rm -rf %{buildroot}%{_infodir}/dir
-ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
+rm -frv %{buildroot}%{_infodir}/dir
 
 %check
 #make check
 
 %post
-/sbin/install-info %{_infodir}/kawa.info.gz %{_infodir}/dir
+install-info %{_infodir}/kawa.info.gz %{_infodir}/dir
 
-%postun
+%preun
 if [ $1 = 0 ]; then
-  /sbin/install-info --delete %{_infodir}/kawa.info.gz %{_infodir}/dir
+  install-info --delete %{_infodir}/kawa.info.gz %{_infodir}/dir
 fi
 
 %files
@@ -77,6 +81,9 @@ fi
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Thu Jul 26 2014 Christopher Meng <rpm at cicku.me> - 1:1.14-2
+- Minor cleanup, explicitly requires java.
+
 * Thu Jun 19 2014 Christopher Meng <rpm at cicku.me> - 1:1.14-1
 - Update to 1.14