[kawa] Update to new upstream version.
Alexander Kurtakov
akurtakov at fedoraproject.org
Wed Mar 23 08:24:09 UTC 2011
commit aaca816d3d539cf8164f07e918ded0ec80cd751d
Author: Alexander Kurtakov <akurtako at redhat.com>
Date: Wed Mar 23 10:22:15 2011 +0200
Update to new upstream version.
- Drop gcj bits.
- Adapt to current guidelines.
.gitignore | 1 +
kawa.spec | 59 ++++++++++++++++++++---------------------------------------
sources | 2 +-
3 files changed, 22 insertions(+), 40 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c3e7335..6d96f94 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
kawa-1.9.1.tar.gz
+kawa-1.11.tar.gz
diff --git a/kawa.spec b/kawa.spec
index 0e18052..ed4f1d2 100644
--- a/kawa.spec
+++ b/kawa.spec
@@ -1,18 +1,13 @@
Summary: Kawa scheme implementation
Name: kawa
-Version: 1.9.1
-%define nversion 1.9.1
-%define dversion 1.9.1
+Version: 1.11
-Release: 10%{?dist}
+Release: 1%{?dist}
License: MIT
Group: Development/Languages
URL: http://www.gnu.org/software/kawa/
-Source0: %{name}-%{nversion}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{nversion}-%{release}-root
-BuildPrereq: gcc-java >= 4.1.0
-Requires: libgcj >= 4.1.0
+Source0: ftp://ftp.gnu.org/pub/gnu/kawa/%{name}-%{version}.tar.gz
BuildRequires: libtool
BuildRequires: texinfo
BuildRequires: groff
@@ -20,12 +15,9 @@ BuildRequires: readline-devel
BuildRequires: ant >= 1.6
BuildRequires: ncurses-devel
BuildRequires: antlr
-BuildRequires: servletapi5
-BuildRequires: util-linux-ng
-Requires: servletapi5
-BuildRequires: java-gcj-compat-devel >= 1.0.31
-Requires(post): java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
+BuildRequires: servlet25
+BuildRequires: util-linux-ng
+Requires: servlet25
Epoch: 1
%description
@@ -36,69 +28,59 @@ script.
%package javadoc
Summary: Javadoc for %{name}
-Group: Development/Documentation
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Group: Documentation
+Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: jpackage-utils
%description javadoc
%{summary}.
%prep
-%setup -q -n %{name}-%{dversion}
+%setup -q
%build
-./configure --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} --enable-kawa-frontend --with-gcj
-export CLASSPATH=$(build-classpath servletapi5 antlr)
-# build kawa.jar with gcj to work around an ecj bug.
-make
-cd gnu/kawa/servlet
-CLASSPATH=../../..:./../../..:$CLASSPATH gcj -C -d ../../.. -g CGIServletWrapper.java GetRequest.java GetResponse.java KawaPageServlet.java KawaServlet.java ReplServlet.java ReplSession.java ServletCallContext.java ServletPrinter.java
-cd ../../..
-tar cvf /tmp/c.tar `find ./ -name \*class`
-make distclean ||:
./configure --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} --enable-kawa-frontend
-tar xvf /tmp/c.tar
+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
%install
-rm -rf $RPM_BUILD_ROOT
-make install install-javadoc-html JAVA=/usr/bin/java DESTDIR=$RPM_BUILD_ROOT JAVADOC_DIR=$RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+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}
-aot-compile-rpm
-
-%clean
-rm -rf $RPM_BUILD_ROOT
%post
/sbin/install-info %{_infodir}/kawa.info.gz %{_infodir}/dir
-%{_bindir}/rebuild-gcj-db
%postun
if [ $1 = 0 ]; then
/sbin/install-info --delete %{_infodir}/kawa.info.gz %{_infodir}/dir
fi
-%{_bindir}/rebuild-gcj-db
%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING INSTALL NEWS README TODO
%{_bindir}/*
%{_datadir}/java/*
-%{_libdir}/gcj/*
%{_mandir}/man1/kawa.1*
%{_mandir}/man1/qexo.1*
%{_infodir}/kawa*
%files javadoc
-%defattr(644,root,root,755)
-%doc %{_javadocdir}/%{name}-%{version}
+%defattr(-,root,root,-)
%doc %{_javadocdir}/%{name}
%changelog
+* Wed Mar 23 2011 Alexander Kurtakov <akurtako at redhat.com> 1:1.11-1
+- Update to new upstream version.
+- Drop gcj bits.
+- Adapt to current guidelines.
+
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.9.1-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
@@ -209,4 +191,3 @@ fi
* Sat Sep 11 2004 Anthony Green <green at spindazzle.org> - 1.7-1
- Initial build.
-
diff --git a/sources b/sources
index f3c9679..677062f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8a1cc2d67127392f6f3f180d53800725 kawa-1.9.1.tar.gz
+641c543a9a0fd60f7132db139c7703e3 kawa-1.11.tar.gz
More information about the scm-commits
mailing list