From 837a20ce85c9484b99c614b015291e5402682cde Mon Sep 17 00:00:00 2001
From: Patrick Gartung <gartung@fnal.gov>
Date: Fri, 27 Jan 2023 18:46:58 +0100
Subject: [PATCH 1/3] Remove patch that does not work with head of
 Igprof/master

---
 igprof.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/igprof.spec b/igprof.spec
index 6a5545d0f7d..a7bf3ace8cb 100644
--- a/igprof.spec
+++ b/igprof.spec
@@ -4,12 +4,12 @@
 %define git_branch cms/master/c6882f4
 %define git_commit 2cd0b7d4fb21223b273c5a085cec2963c8206056
 Source0: git://github.com/%{git_user}/igprof.git?obj=%{git_branch}/%{git_commit}&export=igprof-%{git_commit}&output=/igprof-%{git_commit}.tgz
-Patch0: igprof-gcc8
+#Patch0: igprof-gcc8
 Requires: pcre libunwind
 BuildRequires: cmake
 %prep
 %setup -T -b 0 -n igprof-%{git_commit}
-%patch0 -p1
+#%patch0 -p1
 
 %build
 mkdir -p %i

From f6d1abbf0c344776700ddc1ad3e8db7218aba7dd Mon Sep 17 00:00:00 2001
From: Patrick Gartung <gartung@fnal.gov>
Date: Tue, 31 Jan 2023 14:43:03 +0100
Subject: [PATCH 2/3] Use merge commit

---
 igprof.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/igprof.spec b/igprof.spec
index a7bf3ace8cb..191e2e0ceb8 100644
--- a/igprof.spec
+++ b/igprof.spec
@@ -2,7 +2,7 @@
 %define git_repo igprof
 %define git_user cms-externals
 %define git_branch cms/master/c6882f4
-%define git_commit 2cd0b7d4fb21223b273c5a085cec2963c8206056
+%define git_commit a505ed31e9fd8aa7b1484358268917d2c68ad7fe
 Source0: git://github.com/%{git_user}/igprof.git?obj=%{git_branch}/%{git_commit}&export=igprof-%{git_commit}&output=/igprof-%{git_commit}.tgz
 #Patch0: igprof-gcc8
 Requires: pcre libunwind

From 6c50e98a7988badfd0f0f3a69f6a7e7a1988eb63 Mon Sep 17 00:00:00 2001
From: Patrick Gartung <gartung@fnal.gov>
Date: Tue, 31 Jan 2023 14:44:09 +0100
Subject: [PATCH 3/3] Remove commented out line

---
 igprof.spec | 2 --
 1 file changed, 2 deletions(-)

diff --git a/igprof.spec b/igprof.spec
index 191e2e0ceb8..07ccabf389f 100644
--- a/igprof.spec
+++ b/igprof.spec
@@ -4,12 +4,10 @@
 %define git_branch cms/master/c6882f4
 %define git_commit a505ed31e9fd8aa7b1484358268917d2c68ad7fe
 Source0: git://github.com/%{git_user}/igprof.git?obj=%{git_branch}/%{git_commit}&export=igprof-%{git_commit}&output=/igprof-%{git_commit}.tgz
-#Patch0: igprof-gcc8
 Requires: pcre libunwind
 BuildRequires: cmake
 %prep
 %setup -T -b 0 -n igprof-%{git_commit}
-#%patch0 -p1
 
 %build
 mkdir -p %i