rpms/kawa/devel kawa.spec,1.19,1.20
Anthony Green (green)
fedora-extras-commits at redhat.com
Mon Oct 15 16:35:13 UTC 2007
Author: green
Update of /cvs/extras/rpms/kawa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15368
Modified Files:
kawa.spec
Log Message:
Rev -3. Work-around ecj bug.
Index: kawa.spec
===================================================================
RCS file: /cvs/extras/rpms/kawa/devel/kawa.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- kawa.spec 15 Oct 2007 12:51:30 -0000 1.19
+++ kawa.spec 15 Oct 2007 16:34:40 -0000 1.20
@@ -5,7 +5,7 @@
%define nversion 1.9.1
%define dversion 1.9.1
-Release: 2%{?dist}
+Release: 3%{?dist}
License: MIT
Group: Development/Languages
URL: http://www.gnu.org/software/kawa/
@@ -21,7 +21,6 @@
BuildRequires: ncurses-devel
BuildRequires: antlr
BuildRequires: servletapi5
-BuildRequires: java-1.7.0-icedtea-devel
Requires: servletapi5
BuildRequires: java-gcj-compat-devel >= 1.0.31
Requires(post): java-gcj-compat >= 1.0.31
@@ -45,8 +44,17 @@
%setup -q -n %{name}-%{dversion}
%build
-./configure --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} --enable-kawa-frontend
+./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
ant
# Override the Makefile for generating kawa.1, since it should be
@@ -89,6 +97,10 @@
%doc %{_javadocdir}/%{name}
%changelog
+* Mon Oct 15 2007 Anthony Green <green at redhat.com> - 1:1.9.1-3
+- Don't build with icedtea, as it's not portable.
+- Build .class files with gcj to work around ecj bug.
+
* Mon Oct 15 2007 Anthony Green <green at redhat.com> - 1:1.9.1-2
- Oops. Change %%License to MIT.
More information about the fedora-extras-commits
mailing list