From c00a9b0dde090bb65700d5bb6b96b149d6e85192 Mon Sep 17 00:00:00 2001
From: Andrew Hughes <gnu.andrew@redhat.com>
Date: Wed, 9 Jul 2025 02:22:45 +0100
Subject: [PATCH] Print bundle updates and backouts at end of openjdk_news.sh
 output

- Refer user to get_bundle_versions.sh when bundle updates are found by openjdk_news.sh

Related: RHEL-103209
---
 java-21-openjdk.spec    |  2 ++
 scripts/openjdk_news.sh | 25 ++++++++++++++++---------
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/java-21-openjdk.spec b/java-21-openjdk.spec
index 81b565e..28a8111 100644
--- a/java-21-openjdk.spec
+++ b/java-21-openjdk.spec
@@ -2572,6 +2572,8 @@ cjc.mainProgram(args)
 - * get_bundle_versions.sh: shellcheck: Double-quote variable references (SC2086)
 - * get_bundle_versions.sh: shellcheck: Drop use of cat and pass file to awk directly (SC2002)
 - Add OpenJDK 8u support to get_bundle_versions.sh
+- Print bundle updates and backouts at end of openjdk_news.sh output
+- Refer user to get_bundle_versions.sh when bundle updates are found by openjdk_news.sh
 - Related: RHEL-103209
 
 * Wed Jul 09 2025 Antonio Vieiro <avieirov@redhat.com> - 1:21.0.8.0.1-0.1.ea
diff --git a/scripts/openjdk_news.sh b/scripts/openjdk_news.sh
index e0f466a..24b3513 100755
--- a/scripts/openjdk_news.sh
+++ b/scripts/openjdk_news.sh
@@ -72,18 +72,25 @@ done
 sort "${TMPDIR}/fixes2" "${TMPDIR}/fixes3" | uniq > "${TMPDIR}/fixes"
 rm -f "${TMPDIR}/fixes2" "${TMPDIR}/fixes3"
 
-if grep -i 'backout' "${TMPDIR}/fixes"
-then
-    echo "WARNING: Review the preceding backouts"
-fi
-if grep -iE ': update.*(freetype|gif|harfbuzz|lcms|jpeg|png|zlib)' "${TMPDIR}/fixes"
-then
-    echo "WARNING: Review the preceding with respect to bundled provides"
-fi
-
 echo "In ${TMPDIR}/fixes:"
 cat "${TMPDIR}/fixes"
 
+printf "\nChecking for backouts...";
+if grep -i 'backout' "${TMPDIR}/fixes" > "${TMPDIR}/backouts"; then
+    printf "found.\nWARNING: Review the following backouts:\n"
+    cat "${TMPDIR}/backouts";
+else
+    echo "No apparent backouts.";
+fi
+printf "\nChecking for bundled library updates...";
+if grep -iE ': update.*(freetype|gif|harfbuzz|lcms|jpeg|png|zlib)' "${TMPDIR}/fixes" > "${TMPDIR}/bundles"; then
+    printf "found.\nWARNING: Review the following with respect to bundled provides:\n";
+    cat "${TMPDIR}/bundles";
+    echo "Compare the output of $(dirname "${0}")/get_bundle_versions.sh with the RPM using the JDK source tree"
+else
+    echo "No apparent library updates.";
+fi
+
 # Local Variables:
 # compile-command: "shellcheck openjdk_news.sh"
 # fill-column: 80