From cba2530f5fbb5597453d37b3b77423881346daf1 Mon Sep 17 00:00:00 2001
From: Jiri <jvanek@redhat.com>
Date: Aug 23 2017 07:12:56 +0000
Subject: Adapted to new rpm 4.14 macro evaluation


---

diff --git a/.gitignore b/.gitignore
index 4d30a19..7c5897e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
++ *.rpm
 /class-rewriter.tar.gz
 /desktop-files.tar.gz
 /jdk8-b79.tar.gz
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index 22c1977..0702e5a 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -221,19 +221,19 @@
 #images stub
 %global j2sdkimage       j2sdk-image
 # output dir stub
-%global buildoutputdir() %{expand:openjdk/build/jdk8.build%1}
+%define buildoutputdir() %{expand:openjdk/build/jdk8.build%{?1}}
 #we can copy the javadoc to not arched dir, or made it not noarch
-%global uniquejavadocdir()    %{expand:%{fullversion}%1}
+%define uniquejavadocdir()    %{expand:%{fullversion}%{?1}}
 #main id and dir of this jdk
-%global uniquesuffix()        %{expand:%{fullversion}.%{_arch}%1}
+%define uniquesuffix()        %{expand:%{fullversion}.%{_arch}%{?1}}
 
 # Standard JPackage directories and symbolic links.
-%global sdkdir()        %{expand:%{uniquesuffix %%1}}
-%global jrelnk()        %{expand:jre-%{javaver}-%{origin}-%{version}-%{release}.%{_arch}%1}
+%define sdkdir()        %{expand:%{uniquesuffix %{?1}}}
+%define jrelnk()        %{expand:jre-%{javaver}-%{origin}-%{version}-%{release}.%{_arch}%{?1}}
 
-%global jredir()        %{expand:%{sdkdir %%1}/jre}
-%global sdkbindir()     %{expand:%{_jvmdir}/%{sdkdir %%1}/bin}
-%global jrebindir()     %{expand:%{_jvmdir}/%{jredir %%1}/bin}
+%define jredir()        %{expand:%{sdkdir %{?1}}/jre}
+%define sdkbindir()     %{expand:%{_jvmdir}/%{sdkdir %{?1}}/bin}
+%define jrebindir()     %{expand:%{_jvmdir}/%{jredir %{?1}}/bin}
 
 %global rpm_state_dir %{_localstatedir}/lib/rpm-state/
 
@@ -254,69 +254,69 @@
 %global update_desktop_icons /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
-%global post_script() %{expand:
+%define post_script() %{expand:
 update-desktop-database %{_datadir}/applications &> /dev/null || :
 /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 exit 0
 }
 
 
-%global post_headless() %{expand:
+%define post_headless() %{expand:
 %ifarch %{jit_arches}
 # MetaspaceShared::generate_vtable_methods not implemented for PPC JIT
 %ifnarch %{power64}
 #see https://bugzilla.redhat.com/show_bug.cgi?id=513605
-%{jrebindir %%1}/java -Xshare:dump >/dev/null 2>/dev/null
+%{jrebindir %{?1}}/java -Xshare:dump >/dev/null 2>/dev/null
 %endif
 %endif
 
 PRIORITY=%{priority}
-if [ "%1" == %{debug_suffix} ]; then
+if [ "%{?1}" == %{debug_suffix} ]; then
   let PRIORITY=PRIORITY-1
 fi
 
 ext=.gz
 alternatives \\
-  --install %{_bindir}/java java %{jrebindir %%1}/java $PRIORITY  --family %{name}.%{_arch} \\
-  --slave %{_jvmdir}/jre jre %{_jvmdir}/%{jredir %%1} \\
-  --slave %{_bindir}/jjs jjs %{jrebindir %%1}/jjs \\
-  --slave %{_bindir}/keytool keytool %{jrebindir %%1}/keytool \\
-  --slave %{_bindir}/orbd orbd %{jrebindir %%1}/orbd \\
-  --slave %{_bindir}/pack200 pack200 %{jrebindir %%1}/pack200 \\
-  --slave %{_bindir}/rmid rmid %{jrebindir %%1}/rmid \\
-  --slave %{_bindir}/rmiregistry rmiregistry %{jrebindir %%1}/rmiregistry \\
-  --slave %{_bindir}/servertool servertool %{jrebindir %%1}/servertool \\
-  --slave %{_bindir}/tnameserv tnameserv %{jrebindir %%1}/tnameserv \\
-  --slave %{_bindir}/policytool policytool %{jrebindir %%1}/policytool \\
-  --slave %{_bindir}/unpack200 unpack200 %{jrebindir %%1}/unpack200 \\
+  --install %{_bindir}/java java %{jrebindir %{?1}}/java $PRIORITY  --family %{name}.%{_arch} \\
+  --slave %{_jvmdir}/jre jre %{_jvmdir}/%{jredir %{?1}} \\
+  --slave %{_bindir}/jjs jjs %{jrebindir %{?1}}/jjs \\
+  --slave %{_bindir}/keytool keytool %{jrebindir %{?1}}/keytool \\
+  --slave %{_bindir}/orbd orbd %{jrebindir %{?1}}/orbd \\
+  --slave %{_bindir}/pack200 pack200 %{jrebindir %{?1}}/pack200 \\
+  --slave %{_bindir}/rmid rmid %{jrebindir %{?1}}/rmid \\
+  --slave %{_bindir}/rmiregistry rmiregistry %{jrebindir %{?1}}/rmiregistry \\
+  --slave %{_bindir}/servertool servertool %{jrebindir %{?1}}/servertool \\
+  --slave %{_bindir}/tnameserv tnameserv %{jrebindir %{?1}}/tnameserv \\
+  --slave %{_bindir}/policytool policytool %{jrebindir %{?1}}/policytool \\
+  --slave %{_bindir}/unpack200 unpack200 %{jrebindir %{?1}}/unpack200 \\
   --slave %{_mandir}/man1/java.1$ext java.1$ext \\
-  %{_mandir}/man1/java-%{uniquesuffix %%1}.1$ext \\
+  %{_mandir}/man1/java-%{uniquesuffix %{?1}}.1$ext \\
   --slave %{_mandir}/man1/jjs.1$ext jjs.1$ext \\
-  %{_mandir}/man1/jjs-%{uniquesuffix %%1}.1$ext \\
+  %{_mandir}/man1/jjs-%{uniquesuffix %{?1}}.1$ext \\
   --slave %{_mandir}/man1/keytool.1$ext keytool.1$ext \\
-  %{_mandir}/man1/keytool-%{uniquesuffix %%1}.1$ext \\
+  %{_mandir}/man1/keytool-%{uniquesuffix %{?1}}.1$ext \\
   --slave %{_mandir}/man1/orbd.1$ext orbd.1$ext \\
-  %{_mandir}/man1/orbd-%{uniquesuffix %%1}.1$ext \\
+  %{_mandir}/man1/orbd-%{uniquesuffix %{?1}}.1$ext \\
   --slave %{_mandir}/man1/pack200.1$ext pack200.1$ext \\
-  %{_mandir}/man1/pack200-%{uniquesuffix %%1}.1$ext \\
+  %{_mandir}/man1/pack200-%{uniquesuffix %{?1}}.1$ext \\
   --slave %{_mandir}/man1/rmid.1$ext rmid.1$ext \\
-  %{_mandir}/man1/rmid-%{uniquesuffix %%1}.1$ext \\
+  %{_mandir}/man1/rmid-%{uniquesuffix %{?1}}.1$ext \\
   --slave %{_mandir}/man1/rmiregistry.1$ext rmiregistry.1$ext \\
-  %{_mandir}/man1/rmiregistry-%{uniquesuffix %%1}.1$ext \\
+  %{_mandir}/man1/rmiregistry-%{uniquesuffix %{?1}}.1$ext \\
   --slave %{_mandir}/man1/servertool.1$ext servertool.1$ext \\
-  %{_mandir}/man1/servertool-%{uniquesuffix %%1}.1$ext \\
+  %{_mandir}/man1/servertool-%{uniquesuffix %{?1}}.1$ext \\
   --slave %{_mandir}/man1/tnameserv.1$ext tnameserv.1$ext \\
-  %{_mandir}/man1/tnameserv-%{uniquesuffix %%1}.1$ext \\
+  %{_mandir}/man1/tnameserv-%{uniquesuffix %{?1}}.1$ext \\
   --slave %{_mandir}/man1/policytool.1$ext policytool.1$ext \\
-  %{_mandir}/man1/policytool-%{uniquesuffix %%1}.1$ext \\
+  %{_mandir}/man1/policytool-%{uniquesuffix %{?1}}.1$ext \\
   --slave %{_mandir}/man1/unpack200.1$ext unpack200.1$ext \\
-  %{_mandir}/man1/unpack200-%{uniquesuffix %%1}.1$ext
+  %{_mandir}/man1/unpack200-%{uniquesuffix %{?1}}.1$ext
 
 for X in %{origin} %{javaver} ; do
-  alternatives --install %{_jvmdir}/jre-"$X" jre_"$X" %{_jvmdir}/%{jredir %%1} $PRIORITY --family %{name}.%{_arch}
+  alternatives --install %{_jvmdir}/jre-"$X" jre_"$X" %{_jvmdir}/%{jredir %{?1}} $PRIORITY --family %{name}.%{_arch}
 done
 
-update-alternatives --install %{_jvmdir}/jre-%{javaver}-%{origin} jre_%{javaver}_%{origin} %{_jvmdir}/%{jrelnk %%1} $PRIORITY  --family %{name}.%{_arch}
+update-alternatives --install %{_jvmdir}/jre-%{javaver}-%{origin} jre_%{javaver}_%{origin} %{_jvmdir}/%{jrelnk %{?1}} $PRIORITY  --family %{name}.%{_arch}
 
 
 update-desktop-database %{_datadir}/applications &> /dev/null || :
@@ -324,16 +324,16 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 
 # see pretrans where this file is declared
 # also see that pretrans is only for nondebug
-if [ ! "%1" == %{debug_suffix} ]; then
+if [ ! "%{?1}" == %{debug_suffix} ]; then
   if [ -f %{_libexecdir}/copy_jdk_configs_fixFiles.sh ] ; then
-    sh  %{_libexecdir}/copy_jdk_configs_fixFiles.sh %{rpm_state_dir}/%{name}.%{_arch}  %{_jvmdir}/%{sdkdir %%1}
+    sh  %{_libexecdir}/copy_jdk_configs_fixFiles.sh %{rpm_state_dir}/%{name}.%{_arch}  %{_jvmdir}/%{sdkdir %{?1}}
   fi
 fi
 
 exit 0
 }
 
-%global postun_script() %{expand:
+%define postun_script() %{expand:
 update-desktop-database %{_datadir}/applications &> /dev/null || :
 if [ $1 -eq 0 ] ; then
     /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
@@ -343,121 +343,121 @@ exit 0
 }
 
 
-%global postun_headless() %{expand:
-  alternatives --remove java %{jrebindir %%1}/java
-  alternatives --remove jre_%{origin} %{_jvmdir}/%{jredir %%1}
-  alternatives --remove jre_%{javaver} %{_jvmdir}/%{jredir %%1}
-  alternatives --remove jre_%{javaver}_%{origin} %{_jvmdir}/%{jrelnk %%1}
+%define postun_headless() %{expand:
+  alternatives --remove java %{jrebindir %{?1}}/java
+  alternatives --remove jre_%{origin} %{_jvmdir}/%{jredir %{?1}}
+  alternatives --remove jre_%{javaver} %{_jvmdir}/%{jredir %{?1}}
+  alternatives --remove jre_%{javaver}_%{origin} %{_jvmdir}/%{jrelnk %{?1}}
 }
 
-%global posttrans_script() %{expand:
+%define posttrans_script() %{expand:
 %{update_desktop_icons}
 }
 
-%global post_devel() %{expand:
+%define post_devel() %{expand:
 
 PRIORITY=%{priority}
-if [ "%1" == %{debug_suffix} ]; then
+if [ "%{?1}" == %{debug_suffix} ]; then
   let PRIORITY=PRIORITY-1
 fi
 
 ext=.gz
 alternatives \\
-  --install %{_bindir}/javac javac %{sdkbindir %%1}/javac $PRIORITY  --family %{name}.%{_arch} \\
-  --slave %{_jvmdir}/java java_sdk %{_jvmdir}/%{sdkdir %%1} \\
-  --slave %{_bindir}/appletviewer appletviewer %{sdkbindir %%1}/appletviewer \\
-  --slave %{_bindir}/extcheck extcheck %{sdkbindir %%1}/extcheck \\
-  --slave %{_bindir}/idlj idlj %{sdkbindir %%1}/idlj \\
-  --slave %{_bindir}/jar jar %{sdkbindir %%1}/jar \\
-  --slave %{_bindir}/jarsigner jarsigner %{sdkbindir %%1}/jarsigner \\
-  --slave %{_bindir}/javadoc javadoc %{sdkbindir %%1}/javadoc \\
-  --slave %{_bindir}/javah javah %{sdkbindir %%1}/javah \\
-  --slave %{_bindir}/javap javap %{sdkbindir %%1}/javap \\
-  --slave %{_bindir}/jcmd jcmd %{sdkbindir %%1}/jcmd \\
-  --slave %{_bindir}/jconsole jconsole %{sdkbindir %%1}/jconsole \\
-  --slave %{_bindir}/jdb jdb %{sdkbindir %%1}/jdb \\
-  --slave %{_bindir}/jdeps jdeps %{sdkbindir %%1}/jdeps \\
-  --slave %{_bindir}/jhat jhat %{sdkbindir %%1}/jhat \\
-  --slave %{_bindir}/jinfo jinfo %{sdkbindir %%1}/jinfo \\
-  --slave %{_bindir}/jmap jmap %{sdkbindir %%1}/jmap \\
-  --slave %{_bindir}/jps jps %{sdkbindir %%1}/jps \\
-  --slave %{_bindir}/jrunscript jrunscript %{sdkbindir %%1}/jrunscript \\
-  --slave %{_bindir}/jsadebugd jsadebugd %{sdkbindir %%1}/jsadebugd \\
-  --slave %{_bindir}/jstack jstack %{sdkbindir %%1}/jstack \\
-  --slave %{_bindir}/jstat jstat %{sdkbindir %%1}/jstat \\
-  --slave %{_bindir}/jstatd jstatd %{sdkbindir %%1}/jstatd \\
-  --slave %{_bindir}/native2ascii native2ascii %{sdkbindir %%1}/native2ascii \\
-  --slave %{_bindir}/rmic rmic %{sdkbindir %%1}/rmic \\
-  --slave %{_bindir}/schemagen schemagen %{sdkbindir %%1}/schemagen \\
-  --slave %{_bindir}/serialver serialver %{sdkbindir %%1}/serialver \\
-  --slave %{_bindir}/wsgen wsgen %{sdkbindir %%1}/wsgen \\
-  --slave %{_bindir}/wsimport wsimport %{sdkbindir %%1}/wsimport \\
-  --slave %{_bindir}/xjc xjc %{sdkbindir %%1}/xjc \\
+  --install %{_bindir}/javac javac %{sdkbindir %{?1}}/javac $PRIORITY  --family %{name}.%{_arch} \\
+  --slave %{_jvmdir}/java java_sdk %{_jvmdir}/%{sdkdir %{?1}} \\
+  --slave %{_bindir}/appletviewer appletviewer %{sdkbindir %{?1}}/appletviewer \\
+  --slave %{_bindir}/extcheck extcheck %{sdkbindir %{?1}}/extcheck \\
+  --slave %{_bindir}/idlj idlj %{sdkbindir %{?1}}/idlj \\
+  --slave %{_bindir}/jar jar %{sdkbindir %{?1}}/jar \\
+  --slave %{_bindir}/jarsigner jarsigner %{sdkbindir %{?1}}/jarsigner \\
+  --slave %{_bindir}/javadoc javadoc %{sdkbindir %{?1}}/javadoc \\
+  --slave %{_bindir}/javah javah %{sdkbindir %{?1}}/javah \\
+  --slave %{_bindir}/javap javap %{sdkbindir %{?1}}/javap \\
+  --slave %{_bindir}/jcmd jcmd %{sdkbindir %{?1}}/jcmd \\
+  --slave %{_bindir}/jconsole jconsole %{sdkbindir %{?1}}/jconsole \\
+  --slave %{_bindir}/jdb jdb %{sdkbindir %{?1}}/jdb \\
+  --slave %{_bindir}/jdeps jdeps %{sdkbindir %{?1}}/jdeps \\
+  --slave %{_bindir}/jhat jhat %{sdkbindir %{?1}}/jhat \\
+  --slave %{_bindir}/jinfo jinfo %{sdkbindir %{?1}}/jinfo \\
+  --slave %{_bindir}/jmap jmap %{sdkbindir %{?1}}/jmap \\
+  --slave %{_bindir}/jps jps %{sdkbindir %{?1}}/jps \\
+  --slave %{_bindir}/jrunscript jrunscript %{sdkbindir %{?1}}/jrunscript \\
+  --slave %{_bindir}/jsadebugd jsadebugd %{sdkbindir %{?1}}/jsadebugd \\
+  --slave %{_bindir}/jstack jstack %{sdkbindir %{?1}}/jstack \\
+  --slave %{_bindir}/jstat jstat %{sdkbindir %{?1}}/jstat \\
+  --slave %{_bindir}/jstatd jstatd %{sdkbindir %{?1}}/jstatd \\
+  --slave %{_bindir}/native2ascii native2ascii %{sdkbindir %{?1}}/native2ascii \\
+  --slave %{_bindir}/rmic rmic %{sdkbindir %{?1}}/rmic \\
+  --slave %{_bindir}/schemagen schemagen %{sdkbindir %{?1}}/schemagen \\
+  --slave %{_bindir}/serialver serialver %{sdkbindir %{?1}}/serialver \\
+  --slave %{_bindir}/wsgen wsgen %{sdkbindir %{?1}}/wsgen \\
+  --slave %{_bindir}/wsimport wsimport %{sdkbindir %{?1}}/wsimport \\
+  --slave %{_bindir}/xjc xjc %{sdkbindir %{?1}}/xjc \\
   --slave %{_mandir}/man1/appletviewer.1$ext appletviewer.1$ext \\
-  %{_mandir}/man1/appletviewer-%{uniquesuffix %%1}.1$ext \\
+  %{_mandir}/man1/appletviewer-%{uniquesuffix %{?1}}.1$ext \\
   --slave %{_mandir}/man1/extcheck.1$ext extcheck.1$ext \\
-  %{_mandir}/man1/extcheck-%{uniquesuffix %%1}.1$ext \\
+  %{_mandir}/man1/extcheck-%{uniquesuffix %{?1}}.1$ext \\
   --slave %{_mandir}/man1/idlj.1$ext idlj.1$ext \\
-  %{_mandir}/man1/idlj-%{uniquesuffix %%1}.1$ext \\
+  %{_mandir}/man1/idlj-%{uniquesuffix %{?1}}.1$ext \\
   --slave %{_mandir}/man1/jar.1$ext jar.1$ext \\
-  %{_mandir}/man1/jar-%{uniquesuffix %%1}.1$ext \\
+  %{_mandir}/man1/jar-%{uniquesuffix %{?1}}.1$ext \\
   --slave %{_mandir}/man1/jarsigner.1$ext jarsigner.1$ext \\
-  %{_mandir}/man1/jarsigner-%{uniquesuffix %%1}.1$ext \\
+  %{_mandir}/man1/jarsigner-%{uniquesuffix %{?1}}.1$ext \\
   --slave %{_mandir}/man1/javac.1$ext javac.1$ext \\
-  %{_mandir}/man1/javac-%{uniquesuffix %%1}.1$ext \\
+  %{_mandir}/man1/javac-%{uniquesuffix %{?1}}.1$ext \\
   --slave %{_mandir}/man1/javadoc.1$ext javadoc.1$ext \\
-  %{_mandir}/man1/javadoc-%{uniquesuffix %%1}.1$ext \\
+  %{_mandir}/man1/javadoc-%{uniquesuffix %{?1}}.1$ext \\
   --slave %{_mandir}/man1/javah.1$ext javah.1$ext \\
-  %{_mandir}/man1/javah-%{uniquesuffix %%1}.1$ext \\
+  %{_mandir}/man1/javah-%{uniquesuffix %{?1}}.1$ext \\
   --slave %{_mandir}/man1/javap.1$ext javap.1$ext \\
-  %{_mandir}/man1/javap-%{uniquesuffix %%1}.1$ext \\
+  %{_mandir}/man1/javap-%{uniquesuffix %{?1}}.1$ext \\
   --slave %{_mandir}/man1/jcmd.1$ext jcmd.1$ext \\
-  %{_mandir}/man1/jcmd-%{uniquesuffix %%1}.1$ext \\
+  %{_mandir}/man1/jcmd-%{uniquesuffix %{?1}}.1$ext \\
   --slave %{_mandir}/man1/jconsole.1$ext jconsole.1$ext \\
-  %{_mandir}/man1/jconsole-%{uniquesuffix %%1}.1$ext \\
+  %{_mandir}/man1/jconsole-%{uniquesuffix %{?1}}.1$ext \\
   --slave %{_mandir}/man1/jdb.1$ext jdb.1$ext \\
-  %{_mandir}/man1/jdb-%{uniquesuffix %%1}.1$ext \\
+  %{_mandir}/man1/jdb-%{uniquesuffix %{?1}}.1$ext \\
   --slave %{_mandir}/man1/jdeps.1$ext jdeps.1$ext \\
-  %{_mandir}/man1/jdeps-%{uniquesuffix %%1}.1$ext \\
+  %{_mandir}/man1/jdeps-%{uniquesuffix %{?1}}.1$ext \\
   --slave %{_mandir}/man1/jhat.1$ext jhat.1$ext \\
-  %{_mandir}/man1/jhat-%{uniquesuffix %%1}.1$ext \\
+  %{_mandir}/man1/jhat-%{uniquesuffix %{?1}}.1$ext \\
   --slave %{_mandir}/man1/jinfo.1$ext jinfo.1$ext \\
-  %{_mandir}/man1/jinfo-%{uniquesuffix %%1}.1$ext \\
+  %{_mandir}/man1/jinfo-%{uniquesuffix %{?1}}.1$ext \\
   --slave %{_mandir}/man1/jmap.1$ext jmap.1$ext \\
-  %{_mandir}/man1/jmap-%{uniquesuffix %%1}.1$ext \\
+  %{_mandir}/man1/jmap-%{uniquesuffix %{?1}}.1$ext \\
   --slave %{_mandir}/man1/jps.1$ext jps.1$ext \\
-  %{_mandir}/man1/jps-%{uniquesuffix %%1}.1$ext \\
+  %{_mandir}/man1/jps-%{uniquesuffix %{?1}}.1$ext \\
   --slave %{_mandir}/man1/jrunscript.1$ext jrunscript.1$ext \\
-  %{_mandir}/man1/jrunscript-%{uniquesuffix %%1}.1$ext \\
+  %{_mandir}/man1/jrunscript-%{uniquesuffix %{?1}}.1$ext \\
   --slave %{_mandir}/man1/jsadebugd.1$ext jsadebugd.1$ext \\
-  %{_mandir}/man1/jsadebugd-%{uniquesuffix %%1}.1$ext \\
+  %{_mandir}/man1/jsadebugd-%{uniquesuffix %{?1}}.1$ext \\
   --slave %{_mandir}/man1/jstack.1$ext jstack.1$ext \\
-  %{_mandir}/man1/jstack-%{uniquesuffix %%1}.1$ext \\
+  %{_mandir}/man1/jstack-%{uniquesuffix %{?1}}.1$ext \\
   --slave %{_mandir}/man1/jstat.1$ext jstat.1$ext \\
-  %{_mandir}/man1/jstat-%{uniquesuffix %%1}.1$ext \\
+  %{_mandir}/man1/jstat-%{uniquesuffix %{?1}}.1$ext \\
   --slave %{_mandir}/man1/jstatd.1$ext jstatd.1$ext \\
-  %{_mandir}/man1/jstatd-%{uniquesuffix %%1}.1$ext \\
+  %{_mandir}/man1/jstatd-%{uniquesuffix %{?1}}.1$ext \\
   --slave %{_mandir}/man1/native2ascii.1$ext native2ascii.1$ext \\
-  %{_mandir}/man1/native2ascii-%{uniquesuffix %%1}.1$ext \\
+  %{_mandir}/man1/native2ascii-%{uniquesuffix %{?1}}.1$ext \\
   --slave %{_mandir}/man1/rmic.1$ext rmic.1$ext \\
-  %{_mandir}/man1/rmic-%{uniquesuffix %%1}.1$ext \\
+  %{_mandir}/man1/rmic-%{uniquesuffix %{?1}}.1$ext \\
   --slave %{_mandir}/man1/schemagen.1$ext schemagen.1$ext \\
-  %{_mandir}/man1/schemagen-%{uniquesuffix %%1}.1$ext \\
+  %{_mandir}/man1/schemagen-%{uniquesuffix %{?1}}.1$ext \\
   --slave %{_mandir}/man1/serialver.1$ext serialver.1$ext \\
-  %{_mandir}/man1/serialver-%{uniquesuffix %%1}.1$ext \\
+  %{_mandir}/man1/serialver-%{uniquesuffix %{?1}}.1$ext \\
   --slave %{_mandir}/man1/wsgen.1$ext wsgen.1$ext \\
-  %{_mandir}/man1/wsgen-%{uniquesuffix %%1}.1$ext \\
+  %{_mandir}/man1/wsgen-%{uniquesuffix %{?1}}.1$ext \\
   --slave %{_mandir}/man1/wsimport.1$ext wsimport.1$ext \\
-  %{_mandir}/man1/wsimport-%{uniquesuffix %%1}.1$ext \\
+  %{_mandir}/man1/wsimport-%{uniquesuffix %{?1}}.1$ext \\
   --slave %{_mandir}/man1/xjc.1$ext xjc.1$ext \\
-  %{_mandir}/man1/xjc-%{uniquesuffix %%1}.1$ext
+  %{_mandir}/man1/xjc-%{uniquesuffix %{?1}}.1$ext
 
 for X in %{origin} %{javaver} ; do
   alternatives \\
-    --install %{_jvmdir}/java-"$X" java_sdk_"$X" %{_jvmdir}/%{sdkdir %%1} $PRIORITY  --family %{name}.%{_arch}
+    --install %{_jvmdir}/java-"$X" java_sdk_"$X" %{_jvmdir}/%{sdkdir %{?1}} $PRIORITY  --family %{name}.%{_arch}
 done
 
-update-alternatives --install %{_jvmdir}/java-%{javaver}-%{origin} java_sdk_%{javaver}_%{origin} %{_jvmdir}/%{sdkdir %%1} $PRIORITY  --family %{name}.%{_arch} \\
+update-alternatives --install %{_jvmdir}/java-%{javaver}-%{origin} java_sdk_%{javaver}_%{origin} %{_jvmdir}/%{sdkdir %{?1}} $PRIORITY  --family %{name}.%{_arch} \\
 
 update-desktop-database %{_datadir}/applications &> /dev/null || :
 /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@@ -465,11 +465,11 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 exit 0
 }
 
-%global postun_devel() %{expand:
-  alternatives --remove javac %{sdkbindir %%1}/javac
-  alternatives --remove java_sdk_%{origin} %{_jvmdir}/%{sdkdir %%1}
-  alternatives --remove java_sdk_%{javaver} %{_jvmdir}/%{sdkdir %%1}
-  alternatives --remove java_sdk_%{javaver}_%{origin} %{_jvmdir}/%{sdkdir %%1}
+%define postun_devel() %{expand:
+  alternatives --remove javac %{sdkbindir %{?1}}/javac
+  alternatives --remove java_sdk_%{origin} %{_jvmdir}/%{sdkdir %{?1}}
+  alternatives --remove java_sdk_%{javaver} %{_jvmdir}/%{sdkdir %{?1}}
+  alternatives --remove java_sdk_%{javaver}_%{origin} %{_jvmdir}/%{sdkdir %{?1}}
 
 update-desktop-database %{_datadir}/applications &> /dev/null || :
 
@@ -480,245 +480,245 @@ fi
 exit 0
 }
 
-%global posttrans_devel() %{expand:
+%define posttrans_devel() %{expand:
 %{update_desktop_icons}
 }
 
-%global post_javadoc() %{expand:
+%define post_javadoc() %{expand:
 
 PRIORITY=%{priority}
-if [ "%1" == %{debug_suffix} ]; then
+if [ "%{?1}" == %{debug_suffix} ]; then
   let PRIORITY=PRIORITY-1
 fi
 
 alternatives \\
-  --install %{_javadocdir}/java javadocdir %{_javadocdir}/%{uniquejavadocdir %%1}/api \\
+  --install %{_javadocdir}/java javadocdir %{_javadocdir}/%{uniquejavadocdir %{?1}}/api \\
   $PRIORITY  --family %{name}
 exit 0
 }
 
-%global postun_javadoc() %{expand:
-  alternatives --remove javadocdir %{_javadocdir}/%{uniquejavadocdir %%1}/api
+%define postun_javadoc() %{expand:
+  alternatives --remove javadocdir %{_javadocdir}/%{uniquejavadocdir %{?1}}/api
 exit 0
 }
 
-%global post_javadoc_zip() %{expand:
+%define post_javadoc_zip() %{expand:
 
 PRIORITY=%{priority}
-if [ "%1" == %{debug_suffix} ]; then
+if [ "%{?1}" == %{debug_suffix} ]; then
   let PRIORITY=PRIORITY-1
 fi
 
 alternatives \\
-  --install %{_javadocdir}/java-zip javadoczip %{_javadocdir}/%{uniquejavadocdir %%1}.zip \\
+  --install %{_javadocdir}/java-zip javadoczip %{_javadocdir}/%{uniquejavadocdir %{?1}}.zip \\
   $PRIORITY  --family %{name}
 exit 0
 }
 
-%global postun_javadoc_zip() %{expand:
-  alternatives --remove javadoczip %{_javadocdir}/%{uniquejavadocdir %%1}.zip
+%define postun_javadoc_zip() %{expand:
+  alternatives --remove javadoczip %{_javadocdir}/%{uniquejavadocdir %{?1}}.zip
 exit 0
 }
 
-%global files_jre() %{expand:
+%define files_jre() %{expand:
 %{_datadir}/icons/hicolor/*x*/apps/java-%{javaver}.png
-%{_datadir}/applications/*policytool%1.desktop
+%{_datadir}/applications/*policytool%{?1}.desktop
 }
 
 
-%global files_jre_headless() %{expand:
+%define files_jre_headless() %{expand:
 %defattr(-,root,root,-)
-%license %{buildoutputdir %%1}/images/%{j2sdkimage}/jre/ASSEMBLY_EXCEPTION
-%license %{buildoutputdir %%1}/images/%{j2sdkimage}/jre/LICENSE
-%license %{buildoutputdir %%1}/images/%{j2sdkimage}/jre/THIRD_PARTY_README
-%dir %{_jvmdir}/%{sdkdir %%1}
-%{_jvmdir}/%{jrelnk %%1}
+%license %{buildoutputdir %{?1}}/images/%{j2sdkimage}/jre/ASSEMBLY_EXCEPTION
+%license %{buildoutputdir %{?1}}/images/%{j2sdkimage}/jre/LICENSE
+%license %{buildoutputdir %{?1}}/images/%{j2sdkimage}/jre/THIRD_PARTY_README
+%dir %{_jvmdir}/%{sdkdir %{?1}}
+%{_jvmdir}/%{jrelnk %{?1}}
 %{_jvmprivdir}/*
-%dir %{_jvmdir}/%{jredir %%1}/lib/security
-%{_jvmdir}/%{jredir %%1}/lib/security/cacerts
-%config(noreplace) %{_jvmdir}/%{jredir %%1}/lib/security/US_export_policy.jar
-%config(noreplace) %{_jvmdir}/%{jredir %%1}/lib/security/local_policy.jar
-%config(noreplace) %{_jvmdir}/%{jredir %%1}/lib/security/java.policy
-%config(noreplace) %{_jvmdir}/%{jredir %%1}/lib/security/java.security
-%config(noreplace) %{_jvmdir}/%{jredir %%1}/lib/security/blacklisted.certs
-%config(noreplace) %{_jvmdir}/%{jredir %%1}/lib/logging.properties
-%{_mandir}/man1/java-%{uniquesuffix %%1}.1*
-%{_mandir}/man1/jjs-%{uniquesuffix %%1}.1*
-%{_mandir}/man1/keytool-%{uniquesuffix %%1}.1*
-%{_mandir}/man1/orbd-%{uniquesuffix %%1}.1*
-%{_mandir}/man1/pack200-%{uniquesuffix %%1}.1*
-%{_mandir}/man1/rmid-%{uniquesuffix %%1}.1*
-%{_mandir}/man1/rmiregistry-%{uniquesuffix %%1}.1*
-%{_mandir}/man1/servertool-%{uniquesuffix %%1}.1*
-%{_mandir}/man1/tnameserv-%{uniquesuffix %%1}.1*
-%{_mandir}/man1/unpack200-%{uniquesuffix %%1}.1*
-%{_mandir}/man1/policytool-%{uniquesuffix %%1}.1*
-%config(noreplace) %{_jvmdir}/%{jredir %%1}/lib/security/nss.cfg
+%dir %{_jvmdir}/%{jredir %{?1}}/lib/security
+%{_jvmdir}/%{jredir %{?1}}/lib/security/cacerts
+%config(noreplace) %{_jvmdir}/%{jredir %{?1}}/lib/security/US_export_policy.jar
+%config(noreplace) %{_jvmdir}/%{jredir %{?1}}/lib/security/local_policy.jar
+%config(noreplace) %{_jvmdir}/%{jredir %{?1}}/lib/security/java.policy
+%config(noreplace) %{_jvmdir}/%{jredir %{?1}}/lib/security/java.security
+%config(noreplace) %{_jvmdir}/%{jredir %{?1}}/lib/security/blacklisted.certs
+%config(noreplace) %{_jvmdir}/%{jredir %{?1}}/lib/logging.properties
+%{_mandir}/man1/java-%{uniquesuffix %{?1}}.1*
+%{_mandir}/man1/jjs-%{uniquesuffix %{?1}}.1*
+%{_mandir}/man1/keytool-%{uniquesuffix %{?1}}.1*
+%{_mandir}/man1/orbd-%{uniquesuffix %{?1}}.1*
+%{_mandir}/man1/pack200-%{uniquesuffix %{?1}}.1*
+%{_mandir}/man1/rmid-%{uniquesuffix %{?1}}.1*
+%{_mandir}/man1/rmiregistry-%{uniquesuffix %{?1}}.1*
+%{_mandir}/man1/servertool-%{uniquesuffix %{?1}}.1*
+%{_mandir}/man1/tnameserv-%{uniquesuffix %{?1}}.1*
+%{_mandir}/man1/unpack200-%{uniquesuffix %{?1}}.1*
+%{_mandir}/man1/policytool-%{uniquesuffix %{?1}}.1*
+%config(noreplace) %{_jvmdir}/%{jredir %{?1}}/lib/security/nss.cfg
 %ifarch %{jit_arches}
 %ifnarch %{power64}
-%attr(664, root, root) %ghost %{_jvmdir}/%{jredir %%1}/lib/%{archinstall}/server/classes.jsa
-%attr(664, root, root) %ghost %{_jvmdir}/%{jredir %%1}/lib/%{archinstall}/client/classes.jsa
+%attr(664, root, root) %ghost %{_jvmdir}/%{jredir %{?1}}/lib/%{archinstall}/server/classes.jsa
+%attr(664, root, root) %ghost %{_jvmdir}/%{jredir %{?1}}/lib/%{archinstall}/client/classes.jsa
 %endif
 %endif
-%{_jvmdir}/%{jredir %%1}/lib/%{archinstall}/server/
-%{_jvmdir}/%{jredir %%1}/lib/%{archinstall}/client/
+%{_jvmdir}/%{jredir %{?1}}/lib/%{archinstall}/server/
+%{_jvmdir}/%{jredir %{?1}}/lib/%{archinstall}/client/
 }
 
-%global files_devel() %{expand:
+%define files_devel() %{expand:
 %defattr(-,root,root,-)
-%license %{buildoutputdir %%1}/images/%{j2sdkimage}/ASSEMBLY_EXCEPTION
-%license %{buildoutputdir %%1}/images/%{j2sdkimage}/LICENSE
-%license %{buildoutputdir %%1}/images/%{j2sdkimage}/THIRD_PARTY_README
-%dir %{_jvmdir}/%{sdkdir %%1}/bin
-%dir %{_jvmdir}/%{sdkdir %%1}/include
-%dir %{_jvmdir}/%{sdkdir %%1}/lib
-%{_jvmdir}/%{sdkdir %%1}/bin/appletviewer
-%{_jvmdir}/%{sdkdir %%1}/bin/extcheck
-%{_jvmdir}/%{sdkdir %%1}/bin/idlj
-%{_jvmdir}/%{sdkdir %%1}/bin/jar
-%{_jvmdir}/%{sdkdir %%1}/bin/jarsigner
-%{_jvmdir}/%{sdkdir %%1}/bin/java
-%{_jvmdir}/%{sdkdir %%1}/bin/javac
-%{_jvmdir}/%{sdkdir %%1}/bin/javadoc
-%{_jvmdir}/%{sdkdir %%1}/bin/javah
-%{_jvmdir}/%{sdkdir %%1}/bin/javap
-%{_jvmdir}/%{sdkdir %%1}/bin/java-rmi.cgi
-%{_jvmdir}/%{sdkdir %%1}/bin/jcmd
-%{_jvmdir}/%{sdkdir %%1}/bin/jconsole
-%{_jvmdir}/%{sdkdir %%1}/bin/jdb
-%{_jvmdir}/%{sdkdir %%1}/bin/jdeps
-%{_jvmdir}/%{sdkdir %%1}/bin/jhat
-%{_jvmdir}/%{sdkdir %%1}/bin/jinfo
-%{_jvmdir}/%{sdkdir %%1}/bin/jjs
-%{_jvmdir}/%{sdkdir %%1}/bin/jmap
-%{_jvmdir}/%{sdkdir %%1}/bin/jps
-%{_jvmdir}/%{sdkdir %%1}/bin/jrunscript
-%{_jvmdir}/%{sdkdir %%1}/bin/jsadebugd
-%{_jvmdir}/%{sdkdir %%1}/bin/jstack
-%{_jvmdir}/%{sdkdir %%1}/bin/jstat
-%{_jvmdir}/%{sdkdir %%1}/bin/jstatd
-%{_jvmdir}/%{sdkdir %%1}/bin/keytool
-%{_jvmdir}/%{sdkdir %%1}/bin/native2ascii
-%{_jvmdir}/%{sdkdir %%1}/bin/orbd
-%{_jvmdir}/%{sdkdir %%1}/bin/pack200
-%{_jvmdir}/%{sdkdir %%1}/bin/policytool
-%{_jvmdir}/%{sdkdir %%1}/bin/rmic
-%{_jvmdir}/%{sdkdir %%1}/bin/rmid
-%{_jvmdir}/%{sdkdir %%1}/bin/rmiregistry
-%{_jvmdir}/%{sdkdir %%1}/bin/schemagen
-%{_jvmdir}/%{sdkdir %%1}/bin/serialver
-%{_jvmdir}/%{sdkdir %%1}/bin/servertool
-%{_jvmdir}/%{sdkdir %%1}/bin/tnameserv
-%{_jvmdir}/%{sdkdir %%1}/bin/unpack200
-%{_jvmdir}/%{sdkdir %%1}/bin/wsgen
-%{_jvmdir}/%{sdkdir %%1}/bin/wsimport
-%{_jvmdir}/%{sdkdir %%1}/bin/xjc
-%{_jvmdir}/%{sdkdir %%1}/include/*
-%{_jvmdir}/%{sdkdir %%1}/lib/amd64
-%{_jvmdir}/%{sdkdir %%1}/lib/ct.sym
-%{_jvmdir}/%{sdkdir %%1}/lib/ir.idl
-%{_jvmdir}/%{sdkdir %%1}/lib/jconsole.jar
-%{_jvmdir}/%{sdkdir %%1}/lib/orb.idl
-%{_jvmdir}/%{sdkdir %%1}/lib/sa-jdi.jar
-%{_jvmdir}/%{sdkdir %%1}/lib/dt.jar
-%{_jvmdir}/%{sdkdir %%1}/lib/jexec
-%{_jvmdir}/%{sdkdir %%1}/lib/tools.jar
-%{_jvmjardir}/%{sdkdir %%1}
-%{_datadir}/applications/*jconsole%1.desktop
-%{_mandir}/man1/appletviewer-%{uniquesuffix %%1}.1*
-%{_mandir}/man1/extcheck-%{uniquesuffix %%1}.1*
-%{_mandir}/man1/idlj-%{uniquesuffix %%1}.1*
-%{_mandir}/man1/jar-%{uniquesuffix %%1}.1*
-%{_mandir}/man1/jarsigner-%{uniquesuffix %%1}.1*
-%{_mandir}/man1/javac-%{uniquesuffix %%1}.1*
-%{_mandir}/man1/javadoc-%{uniquesuffix %%1}.1*
-%{_mandir}/man1/javah-%{uniquesuffix %%1}.1*
-%{_mandir}/man1/javap-%{uniquesuffix %%1}.1*
-%{_mandir}/man1/jconsole-%{uniquesuffix %%1}.1*
-%{_mandir}/man1/jcmd-%{uniquesuffix %%1}.1*
-%{_mandir}/man1/jdb-%{uniquesuffix %%1}.1*
-%{_mandir}/man1/jdeps-%{uniquesuffix %%1}.1*
-%{_mandir}/man1/jhat-%{uniquesuffix %%1}.1*
-%{_mandir}/man1/jinfo-%{uniquesuffix %%1}.1*
-%{_mandir}/man1/jmap-%{uniquesuffix %%1}.1*
-%{_mandir}/man1/jps-%{uniquesuffix %%1}.1*
-%{_mandir}/man1/jrunscript-%{uniquesuffix %%1}.1*
-%{_mandir}/man1/jsadebugd-%{uniquesuffix %%1}.1*
-%{_mandir}/man1/jstack-%{uniquesuffix %%1}.1*
-%{_mandir}/man1/jstat-%{uniquesuffix %%1}.1*
-%{_mandir}/man1/jstatd-%{uniquesuffix %%1}.1*
-%{_mandir}/man1/native2ascii-%{uniquesuffix %%1}.1*
-%{_mandir}/man1/rmic-%{uniquesuffix %%1}.1*
-%{_mandir}/man1/schemagen-%{uniquesuffix %%1}.1*
-%{_mandir}/man1/serialver-%{uniquesuffix %%1}.1*
-%{_mandir}/man1/wsgen-%{uniquesuffix %%1}.1*
-%{_mandir}/man1/wsimport-%{uniquesuffix %%1}.1*
-%{_mandir}/man1/xjc-%{uniquesuffix %%1}.1*
+%license %{buildoutputdir %{?1}}/images/%{j2sdkimage}/ASSEMBLY_EXCEPTION
+%license %{buildoutputdir %{?1}}/images/%{j2sdkimage}/LICENSE
+%license %{buildoutputdir %{?1}}/images/%{j2sdkimage}/THIRD_PARTY_README
+%dir %{_jvmdir}/%{sdkdir %{?1}}/bin
+%dir %{_jvmdir}/%{sdkdir %{?1}}/include
+%dir %{_jvmdir}/%{sdkdir %{?1}}/lib
+%{_jvmdir}/%{sdkdir %{?1}}/bin/appletviewer
+%{_jvmdir}/%{sdkdir %{?1}}/bin/extcheck
+%{_jvmdir}/%{sdkdir %{?1}}/bin/idlj
+%{_jvmdir}/%{sdkdir %{?1}}/bin/jar
+%{_jvmdir}/%{sdkdir %{?1}}/bin/jarsigner
+%{_jvmdir}/%{sdkdir %{?1}}/bin/java
+%{_jvmdir}/%{sdkdir %{?1}}/bin/javac
+%{_jvmdir}/%{sdkdir %{?1}}/bin/javadoc
+%{_jvmdir}/%{sdkdir %{?1}}/bin/javah
+%{_jvmdir}/%{sdkdir %{?1}}/bin/javap
+%{_jvmdir}/%{sdkdir %{?1}}/bin/java-rmi.cgi
+%{_jvmdir}/%{sdkdir %{?1}}/bin/jcmd
+%{_jvmdir}/%{sdkdir %{?1}}/bin/jconsole
+%{_jvmdir}/%{sdkdir %{?1}}/bin/jdb
+%{_jvmdir}/%{sdkdir %{?1}}/bin/jdeps
+%{_jvmdir}/%{sdkdir %{?1}}/bin/jhat
+%{_jvmdir}/%{sdkdir %{?1}}/bin/jinfo
+%{_jvmdir}/%{sdkdir %{?1}}/bin/jjs
+%{_jvmdir}/%{sdkdir %{?1}}/bin/jmap
+%{_jvmdir}/%{sdkdir %{?1}}/bin/jps
+%{_jvmdir}/%{sdkdir %{?1}}/bin/jrunscript
+%{_jvmdir}/%{sdkdir %{?1}}/bin/jsadebugd
+%{_jvmdir}/%{sdkdir %{?1}}/bin/jstack
+%{_jvmdir}/%{sdkdir %{?1}}/bin/jstat
+%{_jvmdir}/%{sdkdir %{?1}}/bin/jstatd
+%{_jvmdir}/%{sdkdir %{?1}}/bin/keytool
+%{_jvmdir}/%{sdkdir %{?1}}/bin/native2ascii
+%{_jvmdir}/%{sdkdir %{?1}}/bin/orbd
+%{_jvmdir}/%{sdkdir %{?1}}/bin/pack200
+%{_jvmdir}/%{sdkdir %{?1}}/bin/policytool
+%{_jvmdir}/%{sdkdir %{?1}}/bin/rmic
+%{_jvmdir}/%{sdkdir %{?1}}/bin/rmid
+%{_jvmdir}/%{sdkdir %{?1}}/bin/rmiregistry
+%{_jvmdir}/%{sdkdir %{?1}}/bin/schemagen
+%{_jvmdir}/%{sdkdir %{?1}}/bin/serialver
+%{_jvmdir}/%{sdkdir %{?1}}/bin/servertool
+%{_jvmdir}/%{sdkdir %{?1}}/bin/tnameserv
+%{_jvmdir}/%{sdkdir %{?1}}/bin/unpack200
+%{_jvmdir}/%{sdkdir %{?1}}/bin/wsgen
+%{_jvmdir}/%{sdkdir %{?1}}/bin/wsimport
+%{_jvmdir}/%{sdkdir %{?1}}/bin/xjc
+%{_jvmdir}/%{sdkdir %{?1}}/include/*
+%{_jvmdir}/%{sdkdir %{?1}}/lib/amd64
+%{_jvmdir}/%{sdkdir %{?1}}/lib/ct.sym
+%{_jvmdir}/%{sdkdir %{?1}}/lib/ir.idl
+%{_jvmdir}/%{sdkdir %{?1}}/lib/jconsole.jar
+%{_jvmdir}/%{sdkdir %{?1}}/lib/orb.idl
+%{_jvmdir}/%{sdkdir %{?1}}/lib/sa-jdi.jar
+%{_jvmdir}/%{sdkdir %{?1}}/lib/dt.jar
+%{_jvmdir}/%{sdkdir %{?1}}/lib/jexec
+%{_jvmdir}/%{sdkdir %{?1}}/lib/tools.jar
+%{_jvmjardir}/%{sdkdir %{?1}}
+%{_datadir}/applications/*jconsole%{?1}.desktop
+%{_mandir}/man1/appletviewer-%{uniquesuffix %{?1}}.1*
+%{_mandir}/man1/extcheck-%{uniquesuffix %{?1}}.1*
+%{_mandir}/man1/idlj-%{uniquesuffix %{?1}}.1*
+%{_mandir}/man1/jar-%{uniquesuffix %{?1}}.1*
+%{_mandir}/man1/jarsigner-%{uniquesuffix %{?1}}.1*
+%{_mandir}/man1/javac-%{uniquesuffix %{?1}}.1*
+%{_mandir}/man1/javadoc-%{uniquesuffix %{?1}}.1*
+%{_mandir}/man1/javah-%{uniquesuffix %{?1}}.1*
+%{_mandir}/man1/javap-%{uniquesuffix %{?1}}.1*
+%{_mandir}/man1/jconsole-%{uniquesuffix %{?1}}.1*
+%{_mandir}/man1/jcmd-%{uniquesuffix %{?1}}.1*
+%{_mandir}/man1/jdb-%{uniquesuffix %{?1}}.1*
+%{_mandir}/man1/jdeps-%{uniquesuffix %{?1}}.1*
+%{_mandir}/man1/jhat-%{uniquesuffix %{?1}}.1*
+%{_mandir}/man1/jinfo-%{uniquesuffix %{?1}}.1*
+%{_mandir}/man1/jmap-%{uniquesuffix %{?1}}.1*
+%{_mandir}/man1/jps-%{uniquesuffix %{?1}}.1*
+%{_mandir}/man1/jrunscript-%{uniquesuffix %{?1}}.1*
+%{_mandir}/man1/jsadebugd-%{uniquesuffix %{?1}}.1*
+%{_mandir}/man1/jstack-%{uniquesuffix %{?1}}.1*
+%{_mandir}/man1/jstat-%{uniquesuffix %{?1}}.1*
+%{_mandir}/man1/jstatd-%{uniquesuffix %{?1}}.1*
+%{_mandir}/man1/native2ascii-%{uniquesuffix %{?1}}.1*
+%{_mandir}/man1/rmic-%{uniquesuffix %{?1}}.1*
+%{_mandir}/man1/schemagen-%{uniquesuffix %{?1}}.1*
+%{_mandir}/man1/serialver-%{uniquesuffix %{?1}}.1*
+%{_mandir}/man1/wsgen-%{uniquesuffix %{?1}}.1*
+%{_mandir}/man1/wsimport-%{uniquesuffix %{?1}}.1*
+%{_mandir}/man1/xjc-%{uniquesuffix %{?1}}.1*
 %if %{with_systemtap}
 %dir %{tapsetroot}
 %dir %{tapsetdir}
-%{tapsetdir}/*%{version}-%{release}.%{_arch}%1.stp
-%dir %{_jvmdir}/%{sdkdir %%1}/tapset
-%{_jvmdir}/%{sdkdir %%1}/tapset/*.stp
+%{tapsetdir}/*%{version}-%{release}.%{_arch}%{?1}.stp
+%dir %{_jvmdir}/%{sdkdir %{?1}}/tapset
+%{_jvmdir}/%{sdkdir %{?1}}/tapset/*.stp
 %endif
 }
 
-%global files_demo() %{expand:
+%define files_demo() %{expand:
 %defattr(-,root,root,-)
-%license %{buildoutputdir %%1}/images/%{j2sdkimage}/jre/LICENSE
+%license %{buildoutputdir %{?1}}/images/%{j2sdkimage}/jre/LICENSE
 }
 
-%global files_src() %{expand:
+%define files_src() %{expand:
 %defattr(-,root,root,-)
 %doc README.src
-%{_jvmdir}/%{sdkdir %%1}/src.zip
+%{_jvmdir}/%{sdkdir %{?1}}/src.zip
 }
 
-%global files_javadoc() %{expand:
+%define files_javadoc() %{expand:
 %defattr(-,root,root,-)
-%doc %{_javadocdir}/%{uniquejavadocdir %%1}
-%license %{buildoutputdir %%1}/images/%{j2sdkimage}/jre/LICENSE
+%doc %{_javadocdir}/%{uniquejavadocdir %{?1}}
+%license %{buildoutputdir %{?1}}/images/%{j2sdkimage}/jre/LICENSE
 }
 
-%global files_javadoc_zip() %{expand:
+%define files_javadoc_zip() %{expand:
 %defattr(-,root,root,-)
-%doc %{_javadocdir}/%{uniquejavadocdir %%1}.zip
-%license %{buildoutputdir %%1}/images/%{j2sdkimage}/jre/LICENSE
+%doc %{_javadocdir}/%{uniquejavadocdir %{?1}}.zip
+%license %{buildoutputdir %{?1}}/images/%{j2sdkimage}/jre/LICENSE
 }
 
-%global files_accessibility() %{expand:
-%{_jvmdir}/%{jredir %%1}/lib/%{archinstall}/libatk-wrapper.so
-%{_jvmdir}/%{jredir %%1}/lib/ext/java-atk-wrapper.jar
-%{_jvmdir}/%{jredir %%1}/lib/accessibility.properties
+%define files_accessibility() %{expand:
+%{_jvmdir}/%{jredir %{?1}}/lib/%{archinstall}/libatk-wrapper.so
+%{_jvmdir}/%{jredir %{?1}}/lib/ext/java-atk-wrapper.jar
+%{_jvmdir}/%{jredir %{?1}}/lib/accessibility.properties
 }
 
 # not-duplicated requires/provides/obsolate for normal/debug packages
-%global java_rpo() %{expand:
+%define java_rpo() %{expand:
 Requires: fontconfig%{?_isa}
 Requires: xorg-x11-fonts-Type1
 
 # Requires rest of java
-Requires: %{name}-headless%1%{?_isa} = %{epoch}:%{version}-%{release}
-OrderWithRequires: %{name}-headless%1%{?_isa} = %{epoch}:%{version}-%{release}
+Requires: %{name}-headless%{?1}%{?_isa} = %{epoch}:%{version}-%{release}
+OrderWithRequires: %{name}-headless%{?1}%{?_isa} = %{epoch}:%{version}-%{release}
 
 
 # Standard JPackage base provides.
-Provides: jre-%{javaver}-%{origin}%1 = %{epoch}:%{version}-%{release}
-Provides: jre-%{origin}%1 = %{epoch}:%{version}-%{release}
-Provides: jre-%{javaver}%1 = %{epoch}:%{version}-%{release}
-Provides: java-%{javaver}%1 = %{epoch}:%{version}-%{release}
-Provides: jre = %{javaver}%1
-Provides: java-%{origin}%1 = %{epoch}:%{version}-%{release}
-Provides: java%1 = %{epoch}:%{javaver}
+Provides: jre-%{javaver}-%{origin}%{?1} = %{epoch}:%{version}-%{release}
+Provides: jre-%{origin}%{?1} = %{epoch}:%{version}-%{release}
+Provides: jre-%{javaver}%{?1} = %{epoch}:%{version}-%{release}
+Provides: java-%{javaver}%{?1} = %{epoch}:%{version}-%{release}
+Provides: jre = %{javaver}%{?1}
+Provides: java-%{origin}%{?1} = %{epoch}:%{version}-%{release}
+Provides: java%{?1} = %{epoch}:%{javaver}
 # Standard JPackage extensions provides.
-Provides: java-fonts%1 = %{epoch}:%{version}
+Provides: java-fonts%{?1} = %{epoch}:%{version}
 
-Obsoletes: java-1.7.0-openjdk%1
-Obsoletes: java-1.5.0-gcj%1
+Obsoletes: java-1.7.0-openjdk%{?1}
+Obsoletes: java-1.5.0-gcj%{?1}
 Obsoletes: sinjdoc
 }
 
-%global java_headless_rpo() %{expand:
+%define java_headless_rpo() %{expand:
 # Require /etc/pki/java/cacerts.
 Requires: ca-certificates
 # Require javapackages-tools for ownership of /usr/lib/jvm/
@@ -743,35 +743,35 @@ Requires(postun): %{_sbindir}/alternatives
 Requires(postun):   chkconfig >= 1.7
 
 # Standard JPackage base provides.
-Provides: jre-%{javaver}-%{origin}-headless%1 = %{epoch}:%{version}-%{release}
-Provides: jre-%{origin}-headless%1 = %{epoch}:%{version}-%{release}
-Provides: jre-%{javaver}-headless%1 = %{epoch}:%{version}-%{release}
-Provides: java-%{javaver}-headless%1 = %{epoch}:%{version}-%{release}
-Provides: jre-headless%1 = %{epoch}:%{javaver}
-Provides: java-%{origin}-headless%1 = %{epoch}:%{version}-%{release}
-Provides: java-headless%1 = %{epoch}:%{javaver}
+Provides: jre-%{javaver}-%{origin}-headless%{?1} = %{epoch}:%{version}-%{release}
+Provides: jre-%{origin}-headless%{?1} = %{epoch}:%{version}-%{release}
+Provides: jre-%{javaver}-headless%{?1} = %{epoch}:%{version}-%{release}
+Provides: java-%{javaver}-headless%{?1} = %{epoch}:%{version}-%{release}
+Provides: jre-headless%{?1} = %{epoch}:%{javaver}
+Provides: java-%{origin}-headless%{?1} = %{epoch}:%{version}-%{release}
+Provides: java-headless%{?1} = %{epoch}:%{javaver}
 # Standard JPackage extensions provides.
-Provides: jndi%1 = %{epoch}:%{version}
-Provides: jndi-ldap%1 = %{epoch}:%{version}
-Provides: jndi-cos%1 = %{epoch}:%{version}
-Provides: jndi-rmi%1 = %{epoch}:%{version}
-Provides: jndi-dns%1 = %{epoch}:%{version}
-Provides: jaas%1 = %{epoch}:%{version}
-Provides: jsse%1 = %{epoch}:%{version}
-Provides: jce%1 = %{epoch}:%{version}
-Provides: jdbc-stdext%1 = 4.1
-Provides: java-sasl%1 = %{epoch}:%{version}
+Provides: jndi%{?1} = %{epoch}:%{version}
+Provides: jndi-ldap%{?1} = %{epoch}:%{version}
+Provides: jndi-cos%{?1} = %{epoch}:%{version}
+Provides: jndi-rmi%{?1} = %{epoch}:%{version}
+Provides: jndi-dns%{?1} = %{epoch}:%{version}
+Provides: jaas%{?1} = %{epoch}:%{version}
+Provides: jsse%{?1} = %{epoch}:%{version}
+Provides: jce%{?1} = %{epoch}:%{version}
+Provides: jdbc-stdext%{?1} = 4.1
+Provides: java-sasl%{?1} = %{epoch}:%{version}
 
 #https://bugzilla.redhat.com/show_bug.cgi?id=1312019
 Provides: /usr/bin/jjs
 
-Obsoletes: java-1.7.0-openjdk-headless%1
+Obsoletes: java-1.7.0-openjdk-headless%{?1}
 }
 
-%global java_devel_rpo() %{expand:
+%define java_devel_rpo() %{expand:
 # Require base package.
-Requires:         %{name}%1%{?_isa} = %{epoch}:%{version}-%{release}
-OrderWithRequires: %{name}-headless%1%{?_isa} = %{epoch}:%{version}-%{release}
+Requires:         %{name}%{?1}%{?_isa} = %{epoch}:%{version}-%{release}
+OrderWithRequires: %{name}-headless%{?1}%{?_isa} = %{epoch}:%{version}-%{release}
 # Post requires alternatives to install tool alternatives.
 Requires(post):   %{_sbindir}/alternatives
 # in version 1.7 and higher for --family switch
@@ -782,30 +782,30 @@ Requires(postun): %{_sbindir}/alternatives
 Requires(postun):   chkconfig >= 1.7
 
 # Standard JPackage devel provides.
-Provides: java-sdk-%{javaver}-%{origin}%1 = %{epoch}:%{version}
-Provides: java-sdk-%{javaver}%1 = %{epoch}:%{version}
-Provides: java-sdk-%{origin}%1 = %{epoch}:%{version}
-Provides: java-sdk%1 = %{epoch}:%{javaver}
-Provides: java-%{javaver}-devel%1 = %{epoch}:%{version}
-Provides: java-devel-%{origin}%1 = %{epoch}:%{version}
-Provides: java-devel%1 = %{epoch}:%{javaver}
-
-Obsoletes: java-1.7.0-openjdk-devel%1
-Obsoletes: java-1.5.0-gcj-devel%1
+Provides: java-sdk-%{javaver}-%{origin}%{?1} = %{epoch}:%{version}
+Provides: java-sdk-%{javaver}%{?1} = %{epoch}:%{version}
+Provides: java-sdk-%{origin}%{?1} = %{epoch}:%{version}
+Provides: java-sdk%{?1} = %{epoch}:%{javaver}
+Provides: java-%{javaver}-devel%{?1} = %{epoch}:%{version}
+Provides: java-devel-%{origin}%{?1} = %{epoch}:%{version}
+Provides: java-devel%{?1} = %{epoch}:%{javaver}
+
+Obsoletes: java-1.7.0-openjdk-devel%{?1}
+Obsoletes: java-1.5.0-gcj-devel%{?1}
 }
 
 
-%global java_demo_rpo() %{expand:
-Requires: %{name}%1%{?_isa} = %{epoch}:%{version}-%{release}
-OrderWithRequires: %{name}-headless%1%{?_isa} = %{epoch}:%{version}-%{release}
+%define java_demo_rpo() %{expand:
+Requires: %{name}%{?1}%{?_isa} = %{epoch}:%{version}-%{release}
+OrderWithRequires: %{name}-headless%{?1}%{?_isa} = %{epoch}:%{version}-%{release}
 
 Provides: java-%{javaver}-%{origin}-demo = %{epoch}:%{version}-%{release}
 
-Obsoletes: java-1.7.0-openjdk-demo%1
+Obsoletes: java-1.7.0-openjdk-demo%{?1}
 }
 
-%global java_javadoc_rpo() %{expand:
-OrderWithRequires: %{name}-headless%1%{?_isa} = %{epoch}:%{version}-%{release}
+%define java_javadoc_rpo() %{expand:
+OrderWithRequires: %{name}-headless%{?1}%{?_isa} = %{epoch}:%{version}-%{release}
 # Post requires alternatives to install javadoc alternative.
 Requires(post):   %{_sbindir}/alternatives
 # in version 1.7 and higher for --family switch
@@ -816,36 +816,36 @@ Requires(postun): %{_sbindir}/alternatives
 Requires(postun):   chkconfig >= 1.7
 
 # Standard JPackage javadoc provides.
-Provides: java-javadoc%1 = %{epoch}:%{version}-%{release}
-Provides: java-%{javaver}-javadoc%1 = %{epoch}:%{version}-%{release}
+Provides: java-javadoc%{?1} = %{epoch}:%{version}-%{release}
+Provides: java-%{javaver}-javadoc%{?1} = %{epoch}:%{version}-%{release}
 Provides: java-%{javaver}-%{origin}-javadoc = %{epoch}:%{version}-%{release}
 
-Obsoletes: java-1.7.0-openjdk-javadoc%1
+Obsoletes: java-1.7.0-openjdk-javadoc%{?1}
 
 }
 
-%global java_src_rpo() %{expand:
-Requires: %{name}-headless%1%{?_isa} = %{epoch}:%{version}-%{release}
+%define java_src_rpo() %{expand:
+Requires: %{name}-headless%{?1}%{?_isa} = %{epoch}:%{version}-%{release}
 
 # Standard JPackage javadoc provides.
-Provides: java-src%1 = %{epoch}:%{version}-%{release}
-Provides: java-%{javaver}-src%1 = %{epoch}:%{version}-%{release}
+Provides: java-src%{?1} = %{epoch}:%{version}-%{release}
+Provides: java-%{javaver}-src%{?1} = %{epoch}:%{version}-%{release}
 Provides: java-%{javaver}-%{origin}-src = %{epoch}:%{version}-%{release}
-Obsoletes: java-1.7.0-openjdk-src%1
+Obsoletes: java-1.7.0-openjdk-src%{?1}
 }
 
-%global java_accessibility_rpo() %{expand:
+%define java_accessibility_rpo() %{expand:
 Requires: java-atk-wrapper%{?_isa}
-Requires: %{name}%1%{?_isa} = %{epoch}:%{version}-%{release}
-OrderWithRequires: %{name}-headless%1%{?_isa} = %{epoch}:%{version}-%{release}
+Requires: %{name}%{?1}%{?_isa} = %{epoch}:%{version}-%{release}
+OrderWithRequires: %{name}-headless%{?1}%{?_isa} = %{epoch}:%{version}-%{release}
 
 Provides: java-%{javaver}-%{origin}-accessibility = %{epoch}:%{version}-%{release}
 
-Obsoletes: java-1.7.0-openjdk-accessibility%1
+Obsoletes: java-1.7.0-openjdk-accessibility%{?1}
 }
 
 # Prevent brp-java-repack-jars from being run.
-%global __jar_repack 0
+%define __jar_repack 0
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{updatever}
@@ -1085,7 +1085,7 @@ The OpenJDK runtime environment.
 Summary: OpenJDK Runtime Environment %{debug_on}
 Group:   Development/Languages
 
-%{java_rpo %{debug_suffix_unquoted}}
+%{java_rpo -- %{debug_suffix_unquoted}}
 %description debug
 The OpenJDK runtime environment.
 %{debug_warning}
@@ -1107,7 +1107,7 @@ The OpenJDK runtime environment without audio and video support.
 Summary: OpenJDK Runtime Environment %{debug_on}
 Group:   Development/Languages
 
-%{java_headless_rpo %{debug_suffix_unquoted}}
+%{java_headless_rpo -- %{debug_suffix_unquoted}}
 
 %description headless-debug
 The OpenJDK runtime environment without audio and video support.
@@ -1130,7 +1130,7 @@ The OpenJDK development tools.
 Summary: OpenJDK Development Environment %{debug_on}
 Group:   Development/Tools
 
-%{java_devel_rpo %{debug_suffix_unquoted}}
+%{java_devel_rpo -- %{debug_suffix_unquoted}}
 
 %description devel-debug
 The OpenJDK development tools.
@@ -1153,7 +1153,7 @@ The OpenJDK demos.
 Summary: OpenJDK Demos %{debug_on}
 Group:   Development/Languages
 
-%{java_demo_rpo %{debug_suffix_unquoted}}
+%{java_demo_rpo -- %{debug_suffix_unquoted}}
 
 %description demo-debug
 The OpenJDK demos.
@@ -1176,7 +1176,7 @@ The OpenJDK source bundle.
 Summary: OpenJDK Source Bundle %{for_debug}
 Group:   Development/Languages
 
-%{java_src_rpo %{debug_suffix_unquoted}}
+%{java_src_rpo -- %{debug_suffix_unquoted}}
 
 %description src-debug
 The OpenJDK source bundle %{for_debug}.
@@ -1215,7 +1215,7 @@ Group:   Documentation
 Requires: javapackages-tools
 BuildArch: noarch
 
-%{java_javadoc_rpo %{debug_suffix_unquoted}}
+%{java_javadoc_rpo -- %{debug_suffix_unquoted}}
 
 %description javadoc-debug
 The OpenJDK API documentation %{for_debug}.
@@ -1228,7 +1228,7 @@ Group:   Documentation
 Requires: javapackages-tools
 BuildArch: noarch
 
-%{java_javadoc_rpo %{debug_suffix_unquoted}}
+%{java_javadoc_rpo -- %{debug_suffix_unquoted}}
 
 %description javadoc-zip-debug
 The OpenJDK API documentation compressed in single archive %{for_debug}.
@@ -1256,7 +1256,7 @@ need to.
 %package accessibility-debug
 Summary: OpenJDK accessibility connector %{for_debug}
 
-%{java_accessibility_rpo %{debug_suffix_unquoted}}
+%{java_accessibility_rpo -- %{debug_suffix_unquoted}}
 
 %description accessibility-debug
 See normal java-%{version}-openjdk-accessibility description.
@@ -1976,40 +1976,40 @@ require "copy_jdk_configs.lua"
 
 %if %{include_debug_build} 
 %post debug
-%{post_script %{debug_suffix_unquoted}}
+%{post_script -- %{debug_suffix_unquoted}}
 
 %post headless-debug
-%{post_headless %{debug_suffix_unquoted}}
+%{post_headless -- %{debug_suffix_unquoted}}
 
 %postun debug
-%{postun_script %{debug_suffix_unquoted}}
+%{postun_script -- %{debug_suffix_unquoted}}
 
 %postun headless-debug
-%{postun_headless %{debug_suffix_unquoted}}
+%{postun_headless -- %{debug_suffix_unquoted}}
 
 %posttrans debug
-%{posttrans_script %{debug_suffix_unquoted}}
+%{posttrans_script -- %{debug_suffix_unquoted}}
 
 %post devel-debug
-%{post_devel %{debug_suffix_unquoted}}
+%{post_devel -- %{debug_suffix_unquoted}}
 
 %postun devel-debug
-%{postun_devel %{debug_suffix_unquoted}}
+%{postun_devel -- %{debug_suffix_unquoted}}
 
 %posttrans  devel-debug
-%{posttrans_devel %{debug_suffix_unquoted}}
+%{posttrans_devel -- %{debug_suffix_unquoted}}
 
 %post javadoc-debug
-%{post_javadoc %{debug_suffix_unquoted}}
+%{post_javadoc -- %{debug_suffix_unquoted}}
 
 %postun javadoc-debug
-%{postun_javadoc %{debug_suffix_unquoted}}
+%{postun_javadoc -- %{debug_suffix_unquoted}}
 
 %post javadoc-zip-debug
-%{post_javadoc_zip %{debug_suffix_unquoted}}
+%{post_javadoc_zip -- %{debug_suffix_unquoted}}
 
 %postun javadoc-zip-debug
-%{postun_javadoc_zip %{debug_suffix_unquoted}}
+%{postun_javadoc_zip -- %{debug_suffix_unquoted}}
 %endif
 
 %if %{include_normal_build} 
@@ -2055,28 +2055,28 @@ require "copy_jdk_configs.lua"
 
 %if %{include_debug_build} 
 %files debug -f %{name}.files-debug
-%{files_jre %{debug_suffix_unquoted}}
+%{files_jre -- %{debug_suffix_unquoted}}
 
 %files headless-debug  -f %{name}.files-headless-debug
-%{files_jre_headless %{debug_suffix_unquoted}}
+%{files_jre_headless -- %{debug_suffix_unquoted}}
 
 %files devel-debug
-%{files_devel %{debug_suffix_unquoted}}
+%{files_devel -- %{debug_suffix_unquoted}}
 
 %files demo-debug -f %{name}-demo.files-debug
-%{files_demo %{debug_suffix_unquoted}}
+%{files_demo -- %{debug_suffix_unquoted}}
 
 %files src-debug
-%{files_src %{debug_suffix_unquoted}}
+%{files_src -- %{debug_suffix_unquoted}}
 
 %files javadoc-debug
-%{files_javadoc %{debug_suffix_unquoted}}
+%{files_javadoc -- %{debug_suffix_unquoted}}
 
 %files javadoc-zip-debug
-%{files_javadoc_zip %{debug_suffix_unquoted}}
+%{files_javadoc_zip -- %{debug_suffix_unquoted}}
 
 %files accessibility-debug
-%{files_accessibility %{debug_suffix_unquoted}}
+%{files_accessibility -- %{debug_suffix_unquoted}}
 
 %if %{with_openjfx_binding}
 %files openjfx-debug -f %{name}-openjfx.files-debug
@@ -2091,6 +2091,7 @@ require "copy_jdk_configs.lua"
 - Exclude 8175887 from Shenandoah builds as it has been included in that repo.
 - Added 8164293-pr3412-rh1459641.patch backport from 8u development tree
 - get rid of bin/* and lib/*, fixed rhbz1480777
+- adapted to rpm 4.14: all expanding macros changed to define, all %1 and %%1 replaced by %{?1}
 
 * Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.8.0.141-5.b16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild