From 74e7cd557712661447b639487d797a43087fd173 Mon Sep 17 00:00:00 2001
From: Omair Majid <omajid@redhat.com>
Date: Tue, 12 Sep 2023 17:32:17 -0400
Subject: [PATCH] Update to .NET SDK 7.0.111 and Runtime 7.0.11

Resolves: RHEL-2001
---
 .gitignore     |  1 +
 dotnet7.0.spec | 12 ++++++++----
 sources        |  2 +-
 update-release | 11 +++++++++--
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8eafcaa..bf31e73 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@
 /dotnet-prebuilts-7.0.109-arm64.tar.gz
 /dotnet-prebuilts-7.0.109-ppc64le.tar.gz
 /dotnet-prebuilts-7.0.109-s390x.tar.gz
+/dotnet-v7.0.111.tar.gz
diff --git a/dotnet7.0.spec b/dotnet7.0.spec
index 6c7c612..273f7e1 100644
--- a/dotnet7.0.spec
+++ b/dotnet7.0.spec
@@ -7,10 +7,10 @@
 # until that's done, disable LTO.  This has to happen before setting the flags below.
 %define _lto_cflags %{nil}
 
-%global host_version 7.0.10
-%global runtime_version 7.0.10
+%global host_version 7.0.11
+%global runtime_version 7.0.11
 %global aspnetcore_runtime_version %{runtime_version}
-%global sdk_version 7.0.110
+%global sdk_version 7.0.111
 %global sdk_feature_band_version %(echo %{sdk_version} | cut -d '-' -f 1 | sed -e 's|[[:digit:]][[:digit:]]$|00|')
 %global templates_version %{runtime_version}
 #%%global templates_version %%(echo %%{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }')
@@ -52,7 +52,7 @@
 
 Name:           dotnet7.0
 Version:        %{sdk_rpm_version}
-Release:        4%{?dist}
+Release:        2%{?dist}
 Summary:        .NET Runtime and SDK
 License:        MIT and ASL 2.0 and BSD and LGPLv2+ and CC-BY and CC0 and MS-PL and EPL-1.0 and GPL+ and GPLv2 and ISC and OFL and zlib
 URL:            https://github.com/dotnet/
@@ -621,6 +621,10 @@ export COMPlus_LTTng=0
 
 
 %changelog
+* Tue Sep 12 2023 Omair Majid <omajid@redhat.com> - 7.0.111-2
+- Update to .NET SDK 7.0.111 and Runtime 7.0.11
+- Resolves: RHEL-2001
+
 * Wed Aug 23 2023 Omair Majid <omajid@redhat.com> - 7.0.110-4
 - Disable bootstrap
 - Related: RHBZ#2228570
diff --git a/sources b/sources
index dd4ffb7..91a7fd5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (dotnet-v7.0.110.tar.gz) = 7e4bdc958cb36833366192d513c056379a6b046f5c0d829b1e33b68c429efa3b5da4c006b69e3c32ca233178c368d463488d5afefab3b36a84604c5bd963681b
+SHA512 (dotnet-v7.0.111.tar.gz) = 1198fd000bef148b7964c2583919ad29d45f39975217fa56773df7f6ee85dc369b273332b637fec7101267b91403b1f1c270b4d803143fc28b185e00411ad565
diff --git a/update-release b/update-release
index ef8091c..e112771 100755
--- a/update-release
+++ b/update-release
@@ -95,10 +95,17 @@ comment="Update to .NET SDK ${sdk_version} and Runtime ${runtime_version}"
 commit_message="$comment
 "
 for bug_id in "${bug_ids[@]}"; do
-    comment="$comment
+    if [[ $bug =~ ^[[:digit:]]+$ ]]; then
+        comment="$comment
 - Resolves: RHBZ#$bug_id"
-    commit_message="$commit_message
+        commit_message="$commit_message
 Resolves: RHBZ#$bug_id"
+    else
+        comment="$comment
+- Resolves: $bug_id"
+        commit_message="$commit_message
+Resolves: $bug_id"
+    fi
 done
 
 echo "$commit_message" > git-commit-message