Author: qboosh Date: Sun Mar 2 00:03:41 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- up to 0.97; jikes support dropped, gcj currently broken - so use javac by
default
- updated info patch
---- Files affected:
SPECS:
classpath.spec (1.34 -> 1.35)
---- Diffs:
================================================================
Index: SPECS/classpath.spec
diff -u SPECS/classpath.spec:1.34 SPECS/classpath.spec:1.35
--- SPECS/classpath.spec:1.34 Thu Jan 24 02:47:47 2008
+++ SPECS/classpath.spec Sun Mar 2 01:03:35 2008
@@ -3,21 +3,18 @@
# TODO: split (awt-gtk, midi-alsa, midi-dssi, ???-qt, ???-gconf,
???-gstreamer, browser???, tools, devel-tools)
#
# Conditional build:
-%bcond_with jikes # use jikes instead of gcj
+%bcond_with gcj # use gcj instead of jdk [broken]
%bcond_with apidocs # prepare API documentation (over 200MB)
#
-%if %{without jikes}
-%define with_gcj 1
-%endif
Summary: GNU Classpath (Essential Libraries for Java)
Summary(pl.UTF-8): GNU Classpath (Najważniejsze biblioteki dla Javy)
Name: classpath
-Version: 0.96.1
+Version: 0.97
Release: 0.1
License: GPL v2+ with linking exception
Group: Libraries
Source0: ftp://ftp.gnu.org/gnu/classpath/%{name}-%{version}.tar.gz
-# Source0-md5: a2ffb40f13fc76c2dda8f8311b30add9
+# Source0-md5: a0680ca786d790fbbc99e365a501745a
Patch0: %{name}-info.patch
URL: http://www.gnu.org/software/classpath/classpath.html
BuildRequires: QtCore-devel >= 4.1.0
@@ -33,7 +30,7 @@
BuildRequires: gstreamer-devel >= 0.10.10
BuildRequires: gstreamer-plugins-base-devel >= 0.10.10
BuildRequires: gtk+2-devel >= 2:2.8
-%{!?with_jikes:BuildRequires: jikes >= 1.18}
+%{!?with_gcj:BuildRequires: jdk >= 1.5}
BuildRequires: libmagic-devel
BuildRequires: libstdc++-devel
BuildRequires: libtool >= 1.4.2
@@ -101,6 +98,7 @@
%build
%configure \
+ JAVAC="%{?with_gcj:gcj -C}%{!?with_gcj:javac}" \
MOC=moc-qt4 \
--%{?debug:en}%{!?debug:dis}able-debug \
--enable-gstreamer-peer \
@@ -110,10 +108,8 @@
--enable-load-library \
--enable-qt-peer \
--enable-xmlj \
- --without-ecj \
- --with%{!?with_gcj:out}-gcj \
- --with%{!?with_jikes:out}-jikes \
--with%{!?with_apidocs:out}-gjdoc \
+ --with-javah=%{?with_gcj:gcjh}%{!?with_gcj:javah} \
--disable-examples
%{__make}
@@ -134,10 +130,10 @@
%clean
rm -rf $RPM_BUILD_ROOT
-%post devel -p /sbin/postshell
+%post devel -p /sbin/postshell
-/usr/sbin/fix-info-dir -c %{_infodir}
-%postun devel -p /sbin/postshell
+%postun devel -p /sbin/postshell
-/usr/sbin/fix-info-dir -c %{_infodir}
%files
@@ -218,6 +214,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.35 2008-03-02 00:03:35 qboosh
+- up to 0.97; jikes support dropped, gcj currently broken - so use javac by
default
+- updated info patch
+
Revision 1.34 2008-01-24 01:47:47 glen
- invoke fix-info-dir via /sbin/postshell where possible to avoid extra
/bin/sh dep
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/classpath.spec?r1=1.34&r2=1.35&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
