Architecture specific change in rpms/java-11-openjdk.git

The package rpms/java-11-openjdk.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/java-11-openjdk.git/commit/?id=bfb31....

Change:
+%ifarch %{share_arches}

Thanks.

Full change:
============

commit 9aeb77dd2057953e2dfb476b4f5f75f6fe6eb44c
Author: Jiri Vanek 
Date:   Tue Aug 31 16:50:08 2021 +0200

Bumped release to have set of two packages with  posts change

diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec
index 03ea389..6343d95 100644
--- a/java-11-openjdk.spec
+++ b/java-11-openjdk.spec
@@ -343,7 +343,7 @@
 %global top_level_dir_name   %{origin}
 %global top_level_dir_name_backup %{top_level_dir_name}-backup
 %global buildver        7
-%global rpmrelease      3
+%global rpmrelease      4
 #%%global tagsuffix      ""
 # Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
 %if %is_system_jdk

commit bfb310717f294a2b2b9e677bc424f228a48269b5
Author: Jiri Vanek 
Date:   Mon Aug 30 16:21:11 2021 +0200

alternatives creation moved to posttrans

Thus fixing the old reisntall issue:
    https://bugzilla.redhat.com/show_bug.cgi?id=1200302
    https://bugzilla.redhat.com/show_bug.cgi?id=1976053

diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec
index 3c683f0..03ea389 100644
--- a/java-11-openjdk.spec
+++ b/java-11-openjdk.spec
@@ -77,7 +77,7 @@
 # in alternatives those are slaves and master, very often triplicated by man pages
 # in files all masters and slaves are ghosted
 # the ghosts are here to allow installation via query like `dnf install /usr/bin/java`
-# you can list those files, with appropriate sections: cat *.spec | grep -e --install -e --slave -e post_ 
+# you can list those files, with appropriate sections: cat *.spec | grep -e --install -e --slave -e post_ -e alternatives
 # TODO - fix those hardcoded lists via single list
 # Those files must *NOT* be ghosted for *slowdebug* packages
 # FIXME - if you are moving jshell or jlink or similar, always modify all three sections
@@ -343,7 +343,7 @@
 %global top_level_dir_name   %{origin}
 %global top_level_dir_name_backup %{top_level_dir_name}-backup
 %global buildver        7
-%global rpmrelease      2
+%global rpmrelease      3
 #%%global tagsuffix      ""
 # Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
 %if %is_system_jdk
@@ -464,12 +464,7 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 exit 0
 }

-
-%define post_headless() %{expand:
-%ifarch %{share_arches}
-%{jrebindir -- %{?1}}/java -Xshare:dump >/dev/null 2>/dev/null
-%endif
-
+%define alternatives_java_install() %{expand:
 PRIORITY=%{priority}
 if [ "%{?1}" == %{debug_suffix} ]; then
   let PRIORITY=PRIORITY-1
@@ -507,8 +502,13 @@ for X in %{origin} %{javaver} ; do
   alternatives --install %{_jvmdir}/jre-"$X" jre_"$X" %{_jvmdir}/%{sdkdir -- %{?1}} $PRIORITY --family %{name}.%{_arch}
 done

-update-alternatives --install %{_jvmdir}/jre-%{javaver}-%{origin} jre_%{javaver}_%{origin} %{_jvmdir}/%{jrelnk -- %{?1}} $PRIORITY  --family %{name}.%{_arch}
+alternatives --install %{_jvmdir}/jre-%{javaver}-%{origin} jre_%{javaver}_%{origin} %{_jvmdir}/%{jrelnk -- %{?1}} $PRIORITY  --family %{name}.%{_arch}
+}

+%define post_headless() %{expand:
+%ifarch %{share_arches}
+%{jrebindir -- %{?1}}/java -Xshare:dump >/dev/null 2>/dev/null
+%endif

update-desktop-database %{_datadir}/applications &> /dev/null || :
 /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@@ -545,8 +545,8 @@ exit 0
 %{update_desktop_icons}
 }

-%define post_devel() %{expand:

+%define alternatives_javac_install() %{expand:
 PRIORITY=%{priority}
 if [ "%{?1}" == %{debug_suffix} ]; then
   let PRIORITY=PRIORITY-1
@@ -628,7 +628,9 @@ for X in %{origin} %{javaver} ; do
 done

update-alternatives --install %{_jvmdir}/java-%{javaver}-%{origin} java_sdk_%{javaver}_%{origin} %{_jvmdir}/%{sdkdir -- %{?1}} $PRIORITY  --family %{name}.%{_arch}
+}

+%define post_devel() %{expand:
 update-desktop-database %{_datadir}/applications &> /dev/null || :
 /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :

@@ -651,11 +653,11 @@ exit 0
 }

%define posttrans_devel() %{expand:
+%{alternatives_javac_install --  %{?1}}
 %{update_desktop_icons}
 }

-%define post_javadoc() %{expand:
-
+%define alternatives_javadoc_install() %{expand:
 PRIORITY=%{priority}
 if [ "%{?1}" == %{debug_suffix} ]; then
   let PRIORITY=PRIORITY-1
@@ -672,8 +674,7 @@ exit 0
 exit 0
 }

-%define post_javadoc_zip() %{expand:
-
+%define alternatives_javadoczip_install() %{expand:
 PRIORITY=%{priority}
 if [ "%{?1}" == %{debug_suffix} ]; then
   let PRIORITY=PRIORITY-1
@@ -2147,6 +2148,9 @@ cjc.mainProgram(args)
 %posttrans
 %{posttrans_script %{nil}}

+%posttrans headless
+%{alternatives_java_install %{nil}}
+
 %post devel
 %{post_devel %{nil}}

@@ -2156,14 +2160,14 @@ cjc.mainProgram(args)
 %posttrans  devel
 %{posttrans_devel %{nil}}

-%post javadoc
-%{post_javadoc %{nil}}
+%posttrans javadoc
+%{alternatives_javadoc_install %{nil}}

%postun javadoc
 %{postun_javadoc %{nil}}

-%post javadoc-zip
-%{post_javadoc_zip %{nil}}
+%posttrans javadoc-zip
+%{alternatives_javadoczip_install %{nil}}

%postun javadoc-zip
 %{postun_javadoc_zip %{nil}}
@@ -2176,6 +2180,9 @@ cjc.mainProgram(args)
 %post headless-slowdebug
 %{post_headless -- %{debug_suffix_unquoted}}

+%posttrans headless-slowdebug
+%{alternatives_java_install -- %{debug_suffix_unquoted}}
+
 %postun slowdebug
 %{postun_script -- %{debug_suffix_unquoted}}

@@ -2211,6 +2218,9 @@ cjc.mainProgram(args)
 %posttrans fastdebug
 %{posttrans_script -- %{fastdebug_suffix_unquoted}}

+%posttrans headless-fastdebug
+%{alternatives_java_install -- %{fastdebug_suffix_unquoted}}
+
 %post devel-fastdebug
 %{post_devel -- %{fastdebug_suffix_unquoted}}

@@ -2317,6 +2327,12 @@ cjc.mainProgram(args)
 %endif

%changelog
+* Fri May 07 2021 Jiri Vanek  - 1:11.0.12.0.7-3
+- alternatives creation moved to posttrans
+- Thus fixing the old reisntall issue:
+- https://bugzilla.redhat.com/show_bug.cgi?id=1200302
+- https://bugzilla.redhat.com/show_bug.cgi?id=1976053
+
 * Mon Aug 09 2021 Andrew Hughes  - 1:11.0.12.0.7-2
 - Remove non-Free test from source tarball.

commit d3d7c1f472b6565ab3ff0c572c878464291d9ca0
Author: Andrew Hughes 
Date:   Mon Aug 9 02:09:38 2021 +0100

Remove non-Free test from source tarball.

diff --git a/.gitignore b/.gitignore
index 0552c5f..c5224a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -92,3 +92,4 @@
 /jdk-updates-jdk11u-jdk-11.0.12+4-4curve.tar.xz
 /jdk-updates-jdk11u-jdk-11.0.12+6-4curve.tar.xz
 /jdk-updates-jdk11u-jdk-11.0.12+7-4curve.tar.xz
+/jdk-updates-jdk11u-jdk-11.0.12+7-4curve-clean.tar.xz
diff --git a/generate_source_tarball.sh b/generate_source_tarball.sh
index 9baaf2c..d8c729b 100755
--- a/generate_source_tarball.sh
+++ b/generate_source_tarball.sh
@@ -94,12 +94,22 @@ if [ "x$REPO_ROOT" = "x" ] ; then
     REPO_ROOT="${OPENJDK_URL}/${PROJECT_NAME}/${REPO_NAME}"
     echo "No repository root specified; default to ${REPO_ROOT}"
 fi;
-
 if [ "x$TO_COMPRESS" = "x" ] ; then
     TO_COMPRESS="openjdk"
     echo "No to be compressed targets specified, ; default to ${TO_COMPRESS}"
 fi;

+echo -e "Settings:"
+echo -e "\tVERSION: ${VERSION}"
+echo -e "\tPROJECT_NAME: ${PROJECT_NAME}"
+echo -e "\tREPO_NAME: ${REPO_NAME}"
+echo -e "\tOPENJDK_URL: ${OPENJDK_URL}"
+echo -e "\tCOMPRESSION: ${COMPRESSION}"
+echo -e "\tFILE_NAME_ROOT: ${FILE_NAME_ROOT}"
+echo -e "\tREPO_ROOT: ${REPO_ROOT}"
+echo -e "\tTO_COMPRESS: ${TO_COMPRESS}"
+echo -e "\tPRTBC01: ${PRTBC01}"
+
 if [ -d ${FILE_NAME_ROOT} ] ; then
   echo "exists exists exists exists exists exists exists "
   echo "reusing reusing reusing reusing reusing reusing "
@@ -112,6 +122,11 @@ else
   popd
 fi
 pushd "${FILE_NAME_ROOT}"
+# UnderlineTaglet.java has a BSD license with a field-of-use restriction, making it non-Free
+    if [ -d openjdk/test ] ; then
+	echo "Removing langtools test case with non-Free license"
+	rm -vf openjdk/test/langtools/tools/javadoc/api/basic/taglets/UnderlineTaglet.java
+    fi
     if [ -d openjdk/src ]; then 
         pushd openjdk
             echo "Removing EC source code we don't build"
@@ -148,7 +163,7 @@ pushd "${FILE_NAME_ROOT}"
     else
         SWITCH=czf
     fi
-    TARBALL_NAME=${FILE_NAME_ROOT}-4curve.tar.${COMPRESSION}
+    TARBALL_NAME=${FILE_NAME_ROOT}-4curve-clean.tar.${COMPRESSION}
     tar --exclude-vcs -$SWITCH ${TARBALL_NAME} $TO_COMPRESS
     mv ${TARBALL_NAME} ..
 popd
diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec
index 20a9658..3c683f0 100644
--- a/java-11-openjdk.spec
+++ b/java-11-openjdk.spec
@@ -343,7 +343,7 @@
 %global top_level_dir_name   %{origin}
 %global top_level_dir_name_backup %{top_level_dir_name}-backup
 %global buildver        7
-%global rpmrelease      1
+%global rpmrelease      2
 #%%global tagsuffix      ""
 # Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
 %if %is_system_jdk
@@ -1158,7 +1158,7 @@ URL:      http://openjdk.java.net/

# to regenerate source0 (jdk) run update_package.sh
 # update_package.sh contains hard-coded repos, revisions, tags, and projects to regenerate the source archives
-Source0: jdk-updates-jdk%{featurever}u-jdk-%{filever}+%{buildver}%{?tagsuffix:-%{tagsuffix}}-4curve.tar.xz
+Source0: jdk-updates-jdk%{featurever}u-jdk-%{filever}+%{buildver}%{?tagsuffix:-%{tagsuffix}}-4curve-clean.tar.xz

# Use 'icedtea_sync.sh' to update the following
 # They are based on code contained in the IcedTea project (6.x).
@@ -2317,6 +2317,9 @@ cjc.mainProgram(args)
 %endif

%changelog
+* Mon Aug 09 2021 Andrew Hughes  - 1:11.0.12.0.7-2
+- Remove non-Free test from source tarball.
+
 * Wed Jul 28 2021 Severin Gehwolf  - 1:11.0.12.0.7-1
 - Add patch in order to fix java.library.path issue on aarch64 (JDK-8269668)
 - Resolves: rhbz#1977671
diff --git a/sources b/sources
index 5132871..e12eab2 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz) = 97d026212363b3c83f6a04100ad7f6fdde833d16579717f8756e2b8c2eb70e144a41a330cb9ccde9c3badd37a2d54fdf4650a950ec21d8b686d545ecb2a64d30
-SHA512 (jdk-updates-jdk11u-jdk-11.0.12+7-4curve.tar.xz) = 6a4d083ed9250730f701a4de4af929017cedfdc09015b378519a4e782f9c9771fbb5686e654044b8dceee5962abbacf5af071b277b1584dc27b430f2d60fdc12
+SHA512 (jdk-updates-jdk11u-jdk-11.0.12+7-4curve-clean.tar.xz) = c7180055ef449f2218618049a55fb44ddf4d353d8b32714f092c326387d5e29b49b42e2df2802e01549b086499ade8417e8d0e1b057aa954272072a2c0669151