Author: jajcus Date: Sun Apr 18 18:34:07 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- use the new rpm-build-macros and %use_jdk to select build JDK, build
requirements and not to hardcode 'gcj_home'
---- Files affected:
packages/icedtea6:
icedtea6.spec (1.55 -> 1.56)
---- Diffs:
================================================================
Index: packages/icedtea6/icedtea6.spec
diff -u packages/icedtea6/icedtea6.spec:1.55
packages/icedtea6/icedtea6.spec:1.56
--- packages/icedtea6/icedtea6.spec:1.55 Sun Apr 18 19:10:10 2010
+++ packages/icedtea6/icedtea6.spec Sun Apr 18 20:34:02 2010
@@ -7,6 +7,12 @@
%bcond_without plugin # don't build browser plugin
%bcond_without nss # don't use NSS
+%if %{with bootstrap}
+%define use_jdk java-gcj-compat
+%else
+%define use_jdk icedtea6
+%endif
+
# class data version seen with file(1) that this jvm is able to load
%define _classdataversion 50.0
# JDK/JRE version, as returned with `java -version`, '_' replaced with '.'
@@ -41,7 +47,7 @@
BuildRequires: automake
BuildRequires: bash
BuildRequires: cups-devel
-BuildRequires: fastjar
+BuildRequires: /usr/bin/jar
BuildRequires: freetype-devel >= 2.3
BuildRequires: gawk
%{?with_bootstrap:BuildRequires: gcc-java >= 6:4.3}
@@ -49,11 +55,10 @@
BuildRequires: glib2-devel
BuildRequires: glibc-misc
BuildRequires: gtk+2-devel
-%{!?with_bootstrap:BuildRequires: icedtea6-jdk-base}
-%{?with_bootstrap:BuildRequires: java-gcj-compat-devel-base}
BuildRequires: java-rhino
BuildRequires: java-xalan
BuildRequires: java-xerces
+%buildrequires_jdk
BuildRequires: libffi-devel
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
@@ -61,7 +66,7 @@
BuildRequires: lsb-release
%{?with_nss:BuildRequires: nss-devel}
BuildRequires: pkgconfig
-BuildRequires: rpmbuild(macros) >= 1.364
+BuildRequires: rpmbuild(macros) >= 1.556
BuildRequires: unzip
BuildRequires: util-linux
BuildRequires: xorg-lib-libX11-devel
@@ -91,8 +96,6 @@
Obsoletes: java-sun-tools
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define _gcj_home /usr/%{_lib}/java/java-1.5.0-gcj-1.5.0.0
-
%define dstreldir %{name}-%{version}
%define dstdir %{_jvmdir}/%{dstreldir}
%define jrereldir %{dstreldir}/jre
@@ -395,11 +398,7 @@
ln -s %{SOURCE4} drops
%build
-%if %{with bootstrap}
-export JAVA_HOME=%{_gcj_home}
-%else
-export JAVA_HOME=%{_jvmdir}/icedtea6
-%endif
+export JAVA_HOME=%{java_home}
export PATH="$JAVA_HOME/bin:$PATH"
%{__aclocal}
@@ -409,10 +408,10 @@
%configure \
WGET=%{_bindir}/wget \
%if %{with bootstrap}
- --with-gcj-home=%{_gcj_home} \
+ --with-gcj-home=%{java_home} \
--with-ecj-jar=%{_javadir}/ecj.jar \
%else
- --with-openjdk=%{_jvmdir}/icedtea6 \
+ --with-openjdk=%{java_home} \
%endif
%if %{with plugin}
--enable-plugin \
@@ -855,6 +854,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.56 2010/04/18 18:34:02 jajcus
+- use the new rpm-build-macros and %use_jdk to select build JDK, build
requirements and not to hardcode 'gcj_home'
+
Revision 1.55 2010/04/18 17:10:10 sparky
- BR: fastjar, gawk, glibc-misc, lsb-release, pkgconfig, util-linux
- dropped BR: wget
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/icedtea6/icedtea6.spec?r1=1.55&r2=1.56&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
