From 0574ca8d009f95a67b55448bbec8d67ed92b1567c0e9c7b6aba8871c6fc6e7da Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Wed, 20 Jul 2016 17:15:08 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:Factory/java-1_8_0-openjdk?expand=0&rev=176

---
 java-1_8_0-openjdk.spec | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/java-1_8_0-openjdk.spec b/java-1_8_0-openjdk.spec
index 6c9ce0f..25242e7 100644
--- a/java-1_8_0-openjdk.spec
+++ b/java-1_8_0-openjdk.spec
@@ -17,7 +17,7 @@
 
 
 %{!?aarch64:%global aarch64 aarch64 arm64 armv8}
-%global jit_arches %ix86 x86_64 ppc64 ppc64le %aarch64
+%global jit_arches %{ix86} x86_64 ppc64 ppc64le %{aarch64}
 %global icedtea_version 3.0.1
 %global icedtea_sound_version 1.0.1
 %global buildoutputdir openjdk.build/
@@ -75,7 +75,7 @@
 %ifarch ppc64le
 %global archinstall ppc64le
 %endif
-%ifarch %ix86
+%ifarch %{ix86}
 %global archinstall i386
 %endif
 %ifarch ia64
@@ -87,10 +87,10 @@
 %ifarch s390x
 %global archinstall s390x
 %endif
-%ifarch %arm
+%ifarch %{arm}
 %global archinstall arm
 %endif
-%ifarch %aarch64
+%ifarch %{aarch64}
 %global archinstall aarch64
 %endif
 # 32 bit sparc, optimized for v9
@@ -109,7 +109,7 @@
 %endif
 # bnc#542545
 # 32-bit versus 64-bit specific provides:
-%ifarch %ix86 ppc s390
+%ifarch %{ix86} ppc s390
 %global bits 32
 %endif
 %ifarch x86_64 ia64 s390x
@@ -118,6 +118,7 @@
 %if 0%{?__isa_bits}
 %global bits %{__isa_bits}
 %endif
+%bcond_with zero
 %if 0%{?suse_version} >= 1330 || 0%{?suse_version} == 1315
 %if %{with bootstrap}
 %global with_sunec 0
@@ -127,7 +128,6 @@
 %else
 %global with_sunec 0
 %endif
-%bcond_with zero
 # Turn on/off some features depending on openSUSE version
 %if 0%{?suse_version} >= 1130
 %if ! %{with zero}
@@ -204,7 +204,6 @@ BuildRequires:  gcc-c++
 BuildRequires:  giflib-devel
 BuildRequires:  gtk2-devel
 BuildRequires:  java-bootstrap-devel >= 1.7.0
-BuildRequires:  libXcomposite-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  liblcms2-devel
 BuildRequires:  libpng-devel
@@ -258,6 +257,7 @@ BuildRequires:  libffi-devel
 BuildRequires:  xorg-x11-devel
 %else
 BuildRequires:  libX11-devel
+BuildRequires:  libXcomposite-devel
 BuildRequires:  libXi-devel
 BuildRequires:  libXinerama-devel
 BuildRequires:  libXt-devel
@@ -410,7 +410,7 @@ for file in tapset/*.in; do
     sed -e s:@ABS_SERVER_LIBJVM_SO@:%{_jvmdir}/%{jredir}/lib/%{archinstall}/server/libjvm.so:g $file > $file.1
 # TODO find out which architectures other than ix86 have a client vm
 
-%ifarch %ix86
+%ifarch %{ix86}
     sed -e s:@ABS_CLIENT_LIBJVM_SO@:%{_jvmdir}/%{jredir}/lib/%{archinstall}/client/libjvm.so:g $file.1 > $OUTPUT_FILE
 %else
     sed -e '/@ABS_CLIENT_LIBJVM_SO@/d' $file.1 > $OUTPUT_FILE
@@ -458,7 +458,7 @@ sh autogen.sh
         --disable-infinality \
         --disable-downloading \
         --with-abs-install-dir=%{_jvmdir}/%{sdkdir} \
-%ifnarch %arm %aarch64
+%ifnarch %{arm} %{aarch64}
         --with-parallel-jobs="${NUM_PROC}" \
 %endif
         --with-pkgversion="suse-%{release}-%{_arch}" \
@@ -514,7 +514,7 @@ patch -p0 -i %{PATCH2001}
 )
 
 %if 0%{?suse_version} >= 1330
-%ifarch %ix86
+%ifarch %{ix86}
 for i in {1..10}; do make %{?_smp_mflags} && break; done
 %else
 make %{?_smp_mflags}