commit f04e442be2af47b42f806c657723262118be7558
Author: Jacek Konieczny <[email protected]>
Date: Sun Apr 18 18:34:02 2010 +0000
- use the new rpm-build-macros and %use_jdk to select build JDK, build
requirements and not to hardcode 'gcj_home'
Changed files:
icedtea6.spec -> 1.56
icedtea6.spec | 25 ++++++++++++-------------
1 file changed, 12 insertions(+), 13 deletions(-)
---
diff --git a/icedtea6.spec b/icedtea6.spec
index 8a1f0da..b6f3bd6 100644
--- a/icedtea6.spec
+++ b/icedtea6.spec
@@ -6,6 +6,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 '.'
@@ -40,7 +46,7 @@ BuildRequires: autoconf
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}
@@ -48,11 +54,10 @@ BuildRequires: giflib-devel
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
@@ -60,7 +65,7 @@ BuildRequires: libstdc++-static
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
@@ -90,8 +95,6 @@ Obsoletes: java-sun-sources
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
@@ -394,11 +397,7 @@ ln -s %{SOURCE3} drops
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}
@@ -408,10 +407,10 @@ export PATH="$JAVA_HOME/bin:$PATH"
%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 \
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/icedtea7.git/commitdiff/f360048b2271851d733c2fc755b8e7cae2f337cf
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
