[rpms/java-21-openjdk-portable] f43: Minor reordering of lines

[Jiri Vanek <jvanek@redhat.com>]

A new commit has been pushed.

Repo   : rpms/java-21-openjdk-portable
Branch : f43
Commit : 160b9b9ede72168694e8925c4b2340b0ba2958ad
Author : Jiri Vanek <jvanek@redhat.com>
Date   : 2026-07-28T19:45:16+02:00
Stats  : +16/-16 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/java-21-openjdk-portable/c/160b9b9ede72168694e8925c4b2340b0ba2958ad?branch=f43

Log:
Minor reordering of lines

---
diff --git a/java-21-openjdk-portable.spec b/java-21-openjdk-portable.spec
index b5cd07c..9249bfc 100644
--- a/java-21-openjdk-portable.spec
+++ b/java-21-openjdk-portable.spec
@@ -116,8 +116,6 @@ URL:      http://openjdk.java.net/
 %bcond_without release
 # Enable static library builds by default.
 %bcond_without staticlibs
-# Remove build artifacts by default
-%bcond_with artifacts
 # Build a fresh libjvm.so for use in a copy of the bootstrap JDK
 %bcond_without fresh_libjvm
 # Build with system libraries
@@ -539,32 +537,33 @@ exit 1
 %define jdkportablenameimpl() %(echo %{uniquesuffix ""} | sed "s;%{regexBase};\\0.portable%{1}.jdk;g" | sed "s;openjdkportable;el;g")
 %define jdkportablesourcesnameimpl() %(echo %{uniquesuffix ""} | sed "s;%{regexBase};\\0.portable%{1}.sources;g" | sed "s;openjdkportable;el;g" | sed "s;.%{_arch};.noarch;g")
 %define staticlibsportablenameimpl() %(echo %{uniquesuffix ""} | sed "s;%{regexBase};\\0.portable%{1}.static-libs;g" | sed "s;openjdkportable;el;g")
+
+# RPM 4.19 no longer accept our double percentaged %%{nil} passed to %%{1}
+# so we have to pass in "" but evaluate it, otherwise files will include it
 %define jmodsportablenameimpl() %(echo %{uniquesuffix ""} | sed "s;%{regexBase};\\0.portable%{1}.jmods;g" | sed "s;openjdkportable;el;g")
 %define jreportablearchive()  %{expand:%{jreportablenameimpl -- %%{1}}.tar.xz}
 %define jreportablearchive_for_files()  %(echo %{jreportablearchive -- ""})
 %define jdkportablearchive()  %{expand:%{jdkportablenameimpl -- %%{1}}.tar.xz}
-%define jdkportablesourcesarchive()  %{expand:%{jdkportablesourcesnameimpl -- %%{1}}.tar.xz}
+%define jdkportablearchive_for_files()  %(echo %{jdkportablearchive -- ""})
 %define staticlibsportablearchive()  %{expand:%{staticlibsportablenameimpl -- %%{1}}.tar.xz}
+%define staticlibsportablearchive_for_files()  %(echo %{staticlibsportablearchive -- ""})
+%define jdkportablesourcesarchive()  %{expand:%{jdkportablesourcesnameimpl -- %%{1}}.tar.xz}
+%define jdkportablesourcesname()     %{expand:%{jdkportablesourcesnameimpl -- %%{1}}}
+%define jdkportablesourcesarchive_for_files()  %(echo %{jdkportablesourcesarchive -- ""})
 %define jmodsportablearchive()  %{expand:%{jmodsportablenameimpl -- %%{1}}.tar.xz}
+%define jmodsportablearchive_for_files()  %(echo %{jmodsportablearchive -- ""})
 %define jreportablename()     %{expand:%{jreportablenameimpl -- %%{1}}}
 %define jdkportablename()     %{expand:%{jdkportablenameimpl -- %%{1}}}
-%define jdkportablesourcesname()     %{expand:%{jdkportablesourcesnameimpl -- %%{1}}}
-# Intentionally use jdkportablenameimpl here since we want to have static-libs files overlayed on
-# top of the JDK archive
+# We intentionally use jdkportablenameimpl here since we want to have
+# static-libs files overlayed on top of the JDK archive
 %define staticlibsportablename()     %{expand:%{jdkportablenameimpl -- %%{1}}}
+
+# These macros are not parameterised as the same is shared by all builds
 %define docportablename() %(echo %{uniquesuffix ""} | sed "s;%{regexBase};\\0.portable.docs;g" | sed "s;openjdkportable;el;g")
 %define docportablearchive()  %{docportablename}.tar.xz
 %define miscportablename() %(echo %{uniquesuffix ""} | sed "s;%{regexBase};\\0.portable.misc;g" | sed "s;openjdkportable;el;g")
 %define miscportablearchive()  %{miscportablename}.tar.xz
 
-# RPM 4.19 no longer accept our double percentaged %%{nil} passed to %%{1}
-# so we have to pass in "" but evaluate it, otherwise files record will include it
-%define jreportablearchive_for_files()  %(echo %{jreportablearchive -- ""})
-%define jdkportablearchive_for_files()  %(echo %{jdkportablearchive -- ""})
-%define jdkportablesourcesarchive_for_files()  %(echo %{jdkportablesourcesarchive -- ""})
-%define staticlibsportablearchive_for_files()  %(echo %{staticlibsportablearchive -- ""})
-%define jmodsportablearchive_for_files()  %(echo %{jmodsportablearchive -- ""})
-
 # JDK to use for bootstrapping
 %ifarch %{fastdebug_arches}
 %global bootdebugpkg fastdebug
@@ -588,7 +587,6 @@ exit 1
 %global build_hotspot_first 0
 %endif
 
-
 # VM variant being built
 %ifarch %{zero_arches}
 %global vm_variant zero
@@ -641,7 +639,7 @@ Source0: https://openjdk-sources.osci.io/openjdk%{featurever}/open%{vcstag}%{ea_
 # Use 'icedtea_sync.sh' to update the following
 # They are based on code contained in the IcedTea project (6.x).
 # Systemtap tapsets. Zipped up to keep it small.
-# Disabled in portables
+# Disabled in fedora portables (applied in fedora rpms)
 #Source8: tapsets-icedtea-%%{icedteaver}.tar.xz
 
 # Desktop files. Adapted from IcedTea
@@ -677,6 +675,7 @@ Source18: TestTranslations.java
 # RPM/distribution specific patches
 #
 ############################################
+
 # Crypto policy and FIPS support patches
 # Patch is generated from the fips-21u tree at https://github.com/rh-openjdk/jdk/tree/fips-21u
 # as follows: git diff <vcstag> src make test > fips-21u-$(git show -s --format=%h HEAD).patch
@@ -1000,6 +999,7 @@ export XZ_OPT="-T0"
 # https://bugzilla.redhat.com/show_bug.cgi?id=1189084
 
 # OpenJDK patches
+
 %if %{system_libs}
 # Remove libraries that are linked by both static and dynamic builds
 sh %{SOURCE12} %{top_level_dir_name}