[kawa/f20: 2/3] Update to 1.14

[Christopher Meng]

commit 509d035e317324d8ddd425aa0108aeb0bfe4b371
Author: Christopher Meng <i at cicku.me>
Date:   Tue Jun 24 20:47:38 2014 +0800

    Update to 1.14

 .gitignore |    1 +
 kawa.spec  |   81 +++++++++++++++++++++++++++++++----------------------------
 sources    |    2 +-
 3 files changed, 45 insertions(+), 39 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6d96f94..361e476 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 kawa-1.9.1.tar.gz
 kawa-1.11.tar.gz
+/kawa-1.14.tar.gz
diff --git a/kawa.spec b/kawa.spec
index 50163ef..ea91d91 100644
--- a/kawa.spec
+++ b/kawa.spec
@@ -1,25 +1,22 @@
-Summary: Kawa scheme implementation
-Name: kawa
-
-Version: 1.11
-
-Release: 7%{?dist}
-License: MIT
-Group: Development/Languages
-URL: http://www.gnu.org/software/kawa/
-Source0: ftp://ftp.gnu.org/pub/gnu/kawa/%{name}-%{version}.tar.gz
-BuildRequires:    libtool
-BuildRequires:    texinfo
-BuildRequires:    groff
-BuildRequires:    readline-devel
-BuildRequires:    ant >= 1.6
-BuildRequires:    ncurses-devel
-BuildRequires:    antlr
-BuildRequires:    servlet25
-BuildRequires:    util-linux-ng
-BuildRequires:    java-devel >= 1:1.6.0
-Requires:         servlet25
-Epoch: 1
+Name:           kawa
+Epoch:          1
+Version:        1.15
+Release:        1%{?dist}
+Summary:        Kawa scheme implementation
+License:        MIT
+URL:            http://www.gnu.org/software/kawa/
+Source0:        http://ftp.gnu.org/gnu/kawa/kawa-%{version}.tar.gz
+BuildRequires:  ant
+BuildRequires:  antlr
+BuildRequires:  groff
+BuildRequires:  java-devel >= 1:1.7.0
+BuildRequires:  libtool
+BuildRequires:  ncurses-devel
+BuildRequires:  readline-devel
+BuildRequires:  servlet3
+BuildRequires:  texinfo
+BuildRequires:  util-linux-ng
+Requires:       servlet3
 
 %description
 Kawa is an implementation of the Scheme programming language.  It is
@@ -29,7 +26,6 @@ script.
 
 %package        javadoc
 Summary:        Javadoc for %{name}
-Group:          Documentation
 Requires:       %{name} = %{epoch}:%{version}-%{release}
 Requires:       jpackage-utils
 
@@ -37,23 +33,27 @@ Requires:       jpackage-utils
 %{summary}.
 
 %prep
-%setup -q 
+%setup -q
 
 %build
-./configure --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} --enable-kawa-frontend 
+%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)
 make
-ant
 
 # Override the Makefile for generating kawa.1, since it should be
 # unformatted man page source.
-cp doc/kawa.man doc/kawa.1
-cp doc/qexo.man doc/qexo.1
+cp -p doc/kawa.man doc/kawa.1
+cp -p doc/qexo.man doc/qexo.1
 
 %install
-make install install-javadoc-html JAVA=/usr/bin/java DESTDIR=$RPM_BUILD_ROOT JAVADOC_DIR=$RPM_BUILD_ROOT%{_javadocdir}/%{name}
-rm -f $RPM_BUILD_ROOT/usr/share/info/dir
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+%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}
+
+%check
+#make check
 
 %post
 /sbin/install-info %{_infodir}/kawa.info.gz %{_infodir}/dir
@@ -64,22 +64,27 @@ if [ $1 = 0 ]; then
 fi
 
 %files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING INSTALL NEWS README TODO
-%{_bindir}/*
-%{_datadir}/java/*
+%doc AUTHORS ChangeLog COPYING NEWS README TODO
+%{_bindir}/kawa
+%{_bindir}/qexo
+%{_datadir}/java/kawa*.jar
 %{_mandir}/man1/kawa.1*
 %{_mandir}/man1/qexo.1*
 %{_infodir}/kawa*
 
 %files javadoc
-%defattr(-,root,root,-)
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Thu Jun 19 2014 Christopher Meng <rpm at cicku.me> - 1:1.14-1
+- Update to 1.14
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.11-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
+* Mon Sep 23 2013 Christopher Meng <rpm at cicku.me> - 1:1.13-1
+- Update to 1.13
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.11-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
@@ -170,7 +175,7 @@ fi
 * Thu Feb  9 2006 Anthony Green <green at redhat.com> - 1:1.8-4
 - Rebuild with new 4.1 compiler (post ABI change).
 
-* Wed Nov 14 2005 Anthony Green <green at redhat.com> - 1:1.8-3
+* Mon Nov 14 2005 Anthony Green <green at redhat.com> - 1:1.8-3
 - Rebuild with GCC 4.1.
 
 * Sat Oct  8 2005 Anthony Green <green at redhat.com> - 1:1.8-1
@@ -205,7 +210,7 @@ fi
 * Wed Sep  7 2005 Anthony Green <green at redhat.com> - 1.8beta-1
 - Updgrade to 1.8beta
 
-* Sat Sep  7 2005 Anthony Green <green at redhat.com> - 1.7-2
+* Wed Sep  7 2005 Anthony Green <green at redhat.com> - 1.7-2
 - Build for Fedora Extras.
 
 * Sat Sep 11 2004 Anthony Green <green at spindazzle.org> - 1.7-1
diff --git a/sources b/sources
index 677062f..f4275b7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-641c543a9a0fd60f7132db139c7703e3  kawa-1.11.tar.gz
+1f377b2d74965d270a394f99f5171d7f  kawa-1.14.tar.gz