diff --git a/java-1_8_0-openj9.spec b/java-1_8_0-openj9.spec index 4000f27..bd23ac6 100644 --- a/java-1_8_0-openj9.spec +++ b/java-1_8_0-openj9.spec @@ -16,6 +16,7 @@ # +%{!?aarch64:%global aarch64 aarch64 arm64 armv8} %global debug 0 %global bootcycle 1 # Convert an absolute path to a relative path. Each symbolic link is @@ -63,14 +64,18 @@ %else %global with_pulseaudio 0 %endif +%global archinstall %{_arch} %ifarch x86_64 %global archinstall amd64 %endif -%ifarch ppc64le -%global archinstall ppc64le +%ifarch %{ix86} +%global archinstall i386 %endif -%ifarch s390x -%global archinstall s390x +%ifarch %{arm} +%global archinstall aarch32 +%endif +%ifarch %{aarch64} +%global archinstall aarch64 %endif %if %{debug} %global debugbuild slowdebug @@ -85,14 +90,14 @@ %global imagestarget images %endif %global bits 64 -ExclusiveArch: x86_64 ppc64le s390x +#ExclusiveArch: x86_64 ppc64le s390x Name: java-1_8_0-openj9 Version: %{javaver}.%{updatever} Release: 0 Summary: OpenJDK 8 Runtime Environment with OpenJ9 virtual machine -License: Apache-1.1 and Apache-2.0 and GPL-1.0+ and GPL-2.0 and GPL-2.0-with-classpath-exception and LGPL-2.0 and MPL-1.0 and MPL-1.1 and SUSE-Public-Domain and W3C +License: Apache-1.1 AND Apache-2.0 AND GPL-1.0-or-later AND GPL-2.0-only AND GPL-2.0-only WITH Classpath-exception-2.0 AND LGPL-2.0-only AND MPL-1.0 AND MPL-1.1 AND SUSE-Public-Domain AND W3C Group: Development/Languages/Java -Url: http://openjdk.java.net/ +URL: http://openjdk.java.net/ # Sources from upstream OpenJDK8 project. Source0: %{root_repository}/%{root_revision}.zip Source1: %{omr_repository}/%{omr_revision}.zip @@ -129,16 +134,22 @@ BuildRequires: automake BuildRequires: binutils BuildRequires: cups-devel BuildRequires: desktop-file-utils -BuildRequires: fdupes git freemarker nasm +BuildRequires: fdupes BuildRequires: fontconfig +BuildRequires: freemarker BuildRequires: freetype2-devel -BuildRequires: gcc-c++ libnuma-devel libdwarf-devel libelf-devel +BuildRequires: gcc-c++ BuildRequires: giflib-devel +BuildRequires: git BuildRequires: gtk2-devel +BuildRequires: libdwarf-devel +BuildRequires: libelf-devel BuildRequires: libjpeg-devel BuildRequires: liblcms2-devel +BuildRequires: libnuma-devel BuildRequires: libpng-devel BuildRequires: libxslt +BuildRequires: nasm BuildRequires: pkgconfig BuildRequires: unzip BuildRequires: update-desktop-files @@ -156,14 +167,14 @@ Requires: mozilla-nss # Standard JPackage base provides. Provides: java = %{javaver} Provides: java-%{javaver} = %{version}-%{release} -Provides: java-openjdk = %{version}-%{release} Provides: java-openj9 = %{version}-%{release} +Provides: java-openjdk = %{version}-%{release} Provides: jre = %{javaver} Provides: jre-%{javaver} = %{version}-%{release} -Provides: jre-%{javaver}-openjdk = %{version}-%{release} Provides: jre-%{javaver}-openj9 = %{version}-%{release} -Provides: jre-openjdk = %{version}-%{release} +Provides: jre-%{javaver}-openjdk = %{version}-%{release} Provides: jre-openj9 = %{version}-%{release} +Provides: jre-openjdk = %{version}-%{release} # Standard JPackage extensions provides. Provides: java-fonts = %{version} # Required at least by fop @@ -172,10 +183,10 @@ Provides: java-%{javaver}-%{bits} Provides: java-openjdk-%{bits} = %{version}-%{release} Provides: jre-%{bits} = %{javaver} Provides: jre-%{javaver}-%{bits} -Provides: jre-%{javaver}-openjdk-%{bits} = %{version}-%{release} Provides: jre-%{javaver}-openj9-%{bits} = %{version}-%{release} -Provides: jre-openjdk-%{bits} = %{version}-%{release} +Provides: jre-%{javaver}-openjdk-%{bits} = %{version}-%{release} Provides: jre-openj9-%{bits} = %{version}-%{release} +Provides: jre-openjdk-%{bits} = %{version}-%{release} Provides: jre1.3.x Provides: jre1.4.x Provides: jre1.5.x @@ -210,8 +221,8 @@ The OpenJDK 8 runtime environment. %package headless Summary: OpenJDK 8 Runtime Environment -Group: Development/Languages/Java # Require jpackage-utils for ownership of /usr/lib/jvm/ +Group: Development/Languages/Java Requires: jpackage-utils # Post requires update-alternatives to install tool update-alternatives. Requires(post): update-alternatives @@ -220,14 +231,14 @@ Requires(postun): update-alternatives # Standard JPackage base provides. Provides: java-%{javaver}-headless = %{version}-%{release} Provides: java-headless = %{javaver} -Provides: java-openjdk-headless = %{version}-%{release} Provides: java-openj9-headless = %{version}-%{release} +Provides: java-openjdk-headless = %{version}-%{release} Provides: jre-%{javaver}-headless = %{version}-%{release} -Provides: jre-%{javaver}-openjdk-headless = %{version}-%{release} Provides: jre-%{javaver}-openj9-headless = %{version}-%{release} +Provides: jre-%{javaver}-openjdk-headless = %{version}-%{release} Provides: jre-headless = %{javaver} -Provides: jre-openjdk-headless = %{version}-%{release} Provides: jre-openj9-headless = %{version}-%{release} +Provides: jre-openjdk-headless = %{version}-%{release} # Standard JPackage extensions provides. Provides: jaas = %{version} Provides: java-sasl = %{version} @@ -246,8 +257,8 @@ The OpenJDK 8 runtime environment without audio and video support. %package devel Summary: OpenJDK 8 Development Environment -Group: Development/Languages/Java # Require base package. +Group: Development/Languages/Java Requires: %{name} = %{version}-%{release} # Post requires update-alternatives to install tool update-alternatives. Requires(post): update-alternatives @@ -256,14 +267,14 @@ Requires(postun): update-alternatives # Standard JPackage devel provides. Provides: java-%{javaver}-devel = %{version} Provides: java-devel = %{javaver} -Provides: java-devel-openjdk = %{version} Provides: java-devel-openj9 = %{version} +Provides: java-devel-openjdk = %{version} Provides: java-sdk = %{javaver} Provides: java-sdk-%{javaver} = %{version} -Provides: java-sdk-%{javaver}-openjdk = %{version} Provides: java-sdk-%{javaver}-openj9 = %{version} -Provides: java-sdk-openjdk = %{version} +Provides: java-sdk-%{javaver}-openjdk = %{version} Provides: java-sdk-openj9 = %{version} +Provides: java-sdk-openjdk = %{version} %description devel The OpenJDK 8 development tools.