From 1f3f83ef2eaad8ce51d0759490a03cd5aec004e6 Mon Sep 17 00:00:00 2001
From: dj_palli <dj_palli@microsoft.com>
Date: Wed, 20 Nov 2024 16:59:41 +0000
Subject: [PATCH] go-rpm-macros: update to 3.6.0

---
 .../go-rpm-macros/go-rpm-macros.signatures.json  |  2 +-
 SPECS-EXTENDED/go-rpm-macros/go-rpm-macros.spec  | 16 +++++++++-------
 cgmanifest.json                                  |  4 ++--
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/SPECS-EXTENDED/go-rpm-macros/go-rpm-macros.signatures.json b/SPECS-EXTENDED/go-rpm-macros/go-rpm-macros.signatures.json
index c8a103d1da1..80145751f44 100644
--- a/SPECS-EXTENDED/go-rpm-macros/go-rpm-macros.signatures.json
+++ b/SPECS-EXTENDED/go-rpm-macros/go-rpm-macros.signatures.json
@@ -1,5 +1,5 @@
 {
  "Signatures": {
-  "go-rpm-macros-3.0.9.tar.gz": "b0e32647be12fc78e2dbcc209332b2f2421a9c3e3dcab9b807797aac5a6b6e33"
+  "go-rpm-macros-3.6.0.tar.gz": "890a1f4fc53fd13083ec95c94b05f8d8e299b27bcb9085e3e9b4b0446c87ef0c"
  }
 }
diff --git a/SPECS-EXTENDED/go-rpm-macros/go-rpm-macros.spec b/SPECS-EXTENDED/go-rpm-macros/go-rpm-macros.spec
index f9fef77245b..675bc1cfd10 100644
--- a/SPECS-EXTENDED/go-rpm-macros/go-rpm-macros.spec
+++ b/SPECS-EXTENDED/go-rpm-macros/go-rpm-macros.spec
@@ -4,7 +4,7 @@
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
 %global forgeurl  https://pagure.io/go-rpm-macros
-Version:   3.0.9
+Version:   3.6.0
 %forgemeta
 
 #https://src.fedoraproject.org/rpms/redhat-rpm-config/pull-request/51
@@ -22,14 +22,14 @@ Version:   3.0.9
 ExclusiveArch: %{golang_arches} %{gccgo_arches}
 
 Name:      go-rpm-macros
-Release:   3%{?dist}
+Release:   1%{?dist}
 Summary:   Build-stage rpm automation for Go packages
 
 License:   GPLv3+
 URL:       %{forgeurl}
-# Source:  https://pagure.io/go-rpm-macros/archive/3.0.9/go-rpm-macros-3.0.9.tar.gz
+# Source:  https://pagure.io/go-rpm-macros/archive/3.6.0/go-rpm-macros-3.6.0.tar.gz
 Source:    %{forgesource}
-Patch0:    fixing_ldflags_for_azl.patch
+#Patch0:    fixing_ldflags_for_azl.patch
 
 Requires:  go-srpm-macros = %{version}-%{release}
 Requires:  go-filesystem  = %{version}-%{release}
@@ -90,9 +90,7 @@ This package contains documented rpm spec templates showcasing how to use the
 macros provided by go-rpm-macros to create Go packages.
 
 %prep
-%forgesetup
-%patch 0 -p1
-
+%forgeautosetup -p1
 %writevars -f rpm/macros.d/macros.go-srpm golang_arches gccgo_arches gopath
 for template in templates/rpm/*\.spec ; do
   target=$(echo "${template}" | sed "s|^\(.*\)\.spec$|\1-bare.spec|g")
@@ -170,6 +168,10 @@ install -m 0644 -vp   rpm/macros.d/macros.go-compilers-gcc \
 %{_spectemplatedir}/*.spec
 
 %changelog
+* Wed Nov 20 2024 Durga Jagadeesh Palli <v-dpalli@microsoft.com> - 3.6.0-1
+- Update to 3.6.0.
+
+
 * Tue Mar 01 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 3.0.9-3
 - Fixing Go's linker flags.
 - License verified.
diff --git a/cgmanifest.json b/cgmanifest.json
index 59ac79df69a..e5a1af85ed9 100644
--- a/cgmanifest.json
+++ b/cgmanifest.json
@@ -4570,8 +4570,8 @@
         "type": "other",
         "other": {
           "name": "go-rpm-macros",
-          "version": "3.0.9",
-          "downloadUrl": "https://pagure.io/go-rpm-macros/archive/3.0.9/go-rpm-macros-3.0.9.tar.gz"
+          "version": "3.6.0",
+          "downloadUrl": "https://pagure.io/go-rpm-macros/archive/3.6.0/go-rpm-macros-3.6.0.tar.gz"
         }
       }
     },