OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 14-Oct-2007 10:04:06
Branch: HEAD Handle: 2007101409040500
Added files:
openpkg-src/kaffe kaffe.patch
Modified files:
openpkg-src/kaffe kaffe.spec
Log:
upgrading package: kaffe 1.1.7 -> 1.1.8
Summary:
Revision Changes Path
1.1 +12 -0 openpkg-src/kaffe/kaffe.patch
1.17 +9 -4 openpkg-src/kaffe/kaffe.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/kaffe/kaffe.patch
============================================================================
$ cvs diff -u -r0 -r1.1 kaffe.patch
--- /dev/null 2007-10-14 10:00:58 +0200
+++ kaffe.patch 2007-10-14 10:04:06 +0200
@@ -0,0 +1,12 @@
+Index: libraries/javalib/Makefile.in
+--- libraries/javalib/Makefile.in.orig 2007-09-13 12:31:58 +0200
++++ libraries/javalib/Makefile.in 2007-10-14 09:53:45 +0200
+@@ -720,7 +720,7 @@
+ install-data-local: installdirs
+ if test -f $(DESTDIR)${jrelibdir}/glibj.zip ; then \
+ if ! test -f $(DESTDIR)${jrelibdir}/rt.jar ; then \
+- $(LN_S) $(DESTDIR)${jrelibdir}/glibj.zip
$(DESTDIR)${jrelibdir}/rt.jar ; \
++ $(LN_S) ${jrelibdir}/glibj.zip
$(DESTDIR)${jrelibdir}/rt.jar ; \
+ fi ; \
+ fi
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/kaffe/kaffe.spec
============================================================================
$ cvs diff -u -r1.16 -r1.17 kaffe.spec
--- openpkg-src/kaffe/kaffe.spec 1 Jan 2007 17:38:54 -0000 1.16
+++ openpkg-src/kaffe/kaffe.spec 14 Oct 2007 08:04:05 -0000 1.17
@@ -32,16 +32,17 @@
Class: EVAL
Group: Language
License: GPL
-Version: 1.1.7
-Release: 20061013
+Version: 1.1.8
+Release: 20071014
# list of sources
Source0:
ftp://ftp.kaffe.org/pub/kaffe/v1.1.x-development/kaffe-%{version}.tar.gz
+Patch0: kaffe.patch
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040130, gcc, make, jikes, infozip,
pkgconfig
+BuildPreReq: OpenPKG, openpkg >= 20040130, gcc, make, ecj, infozip,
pkgconfig
PreReq: OpenPKG, openpkg >= 20040130
BuildPreReq: libiconv, gmp, libffi
PreReq: libiconv, gmp, libffi
@@ -62,6 +63,7 @@
%prep
%setup -q
+ %patch -p0
%build
%{l_shtool} subst \
@@ -73,8 +75,10 @@
LDFLAGS="%{l_ldflags}" \
./configure \
--prefix=%{l_prefix} \
+ --mandir=%{l_prefix}/man \
+ --infodir=%{l_prefix}/info \
--with-iconv-prefix=%{l_prefix} \
- --with-jikes=%{l_prefix}/bin/jikes \
+ --with-ecj=%{l_prefix}/bin/ecj \
--with-libffi \
--with-gmp \
--disable-native-awt \
@@ -88,6 +92,7 @@
%{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/locale
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
%files -f files
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
