From 5958bb69de7e2208598507a658fea919ce8b53ff7f2158cbea695b357c2d28ed Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Thu, 16 Oct 2014 19:32:22 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:Factory/java-1_8_0-openjdk?expand=0&rev=32

---
 java-1_8_0-openjdk.spec | 51 ++++++++++++++++++++++++++---------------
 1 file changed, 32 insertions(+), 19 deletions(-)

diff --git a/java-1_8_0-openjdk.spec b/java-1_8_0-openjdk.spec
index 71e9646..b95ccdd 100644
--- a/java-1_8_0-openjdk.spec
+++ b/java-1_8_0-openjdk.spec
@@ -16,9 +16,10 @@
 #
 
 
+%{!?aarch64:%global aarch64 aarch64 arm64 armv8}
+%global jit_arches %ix86 x86_64 ppc64 ppc64le
 %global debug 0
 %global bootcycle 1
-%global jit_arches %ix86 x86_64 ppc64 ppc64le
 %global buildoutputdir build
 # Convert an absolute path to a relative path.  Each symbolic link is
 # specified relative to the directory in which it is installed so that
@@ -63,10 +64,6 @@
 %global cacerts  %{_jvmdir}/%{jredir}/lib/security/cacerts
 # real file made by update-ca-certificates
 %global javacacerts %{_var}/lib/ca-certificates/java-cacerts
-%{!?aarch64:%global aarch64 aarch64 arm64 armv8}
-%ifnarch %{jit_arches}
-%global _with_zero 1
-%endif
 %ifarch x86_64
 %global archinstall amd64
 %endif
@@ -117,10 +114,8 @@
 %global imagesdir images
 %global imagestarget images
 %endif
-%ifarch %{jit_arches}
-%global with_systemtap 1
-%else
-%global with_systemtap 0
+%ifnarch %{jit_arches}
+%global _with_zero 1
 %endif
 %if 0%{?suse_version} >= 1140
 %global with_pulseaudio 1
@@ -128,6 +123,20 @@
 %global with_pulseaudio 0
 %endif
 %bcond_with zero
+# Turn on/off some features depending on openSUSE version
+%if 0%{?suse_version} >= 1130
+%if ! %{with zero}
+%global with_systemtap 1
+%else
+%global with_systemtap 0
+%endif
+%else
+%global with_systemtap 0
+%endif
+%if %{with_systemtap}
+%global tapsetroot      %{_datadir}/systemtap
+%global tapsetdir %{tapsetroot}/tapset/%{_build_cpu}
+%endif
 %if %{with_systemtap}
 # Where to install systemtap tapset (links)
 # We would like these to be in a package specific subdir,
@@ -221,15 +230,10 @@ BuildRequires:  cups-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  fdupes
 BuildRequires:  fontconfig
-BuildRequires:  freetype-devel
+BuildRequires:  freetype2-devel
 BuildRequires:  gcc-c++
 BuildRequires:  giflib-devel
 BuildRequires:  gtk2-devel
-BuildRequires:  libX11-devel
-BuildRequires:  libXi-devel
-BuildRequires:  libXinerama-devel
-BuildRequires:  libXt-devel
-BuildRequires:  libXtst-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  liblcms2-devel
 BuildRequires:  libpng-devel
@@ -259,6 +263,19 @@ Provides:       jre-openjdk = %{version}-%{release}
 # Standard JPackage extensions provides.
 Provides:       java-fonts = %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+# Zero-assembler build requirement.
+%if %{with zero}
+BuildRequires:  libffi-devel
+%endif
+%if 0%{?suse_version} <= 1130
+BuildRequires:  xorg-x11-devel
+%else
+BuildRequires:  libX11-devel
+BuildRequires:  libXi-devel
+BuildRequires:  libXinerama-devel
+BuildRequires:  libXt-devel
+BuildRequires:  libXtst-devel
+%endif
 %ifarch %ix86 ppc
 Provides:       jre-32 = %{javaver}
 %endif
@@ -270,10 +287,6 @@ BuildRequires:  java-bootstrap-devel >= 1.6.0
 %else
 BuildRequires:  java-devel >= %{javaver}
 %endif
-# Zero-assembler build requirement.
-%ifnarch %{jit_arches}
-BuildRequires:  libffi-devel
-%endif
 # runtime certificates generation available in 11.3+ - bnc#596177
 %if 0%{?suse_version} >= 1130
 BuildRequires:  java-ca-certificates