From 9c3cc89094ac53bdbebeab579c2b4de12730888a Mon Sep 17 00:00:00 2001
From: Michal Domonkos <mdomonko@redhat.com>
Date: Aug 02 2022 12:28:10 +0000
Subject: Revert %%autosetup patch due to another regression


The repo may be initialized before the macro runs, in which case we
would fail to create the initial main branch and thus fail on "git
branch --set-upstream-to=main".  This caused an FTBFS in the edk2
package:

https://github.com/rpm-software-management/rpm/pull/2121#issuecomment-1202349789

Revert the patch for now as a hotfit and revisit the actual use case
later upstream, either fixing it properly or reverting there as well.

---

diff --git a/0001-Use-explicit-default-branch-in-autosetup-S-git.patch b/0001-Use-explicit-default-branch-in-autosetup-S-git.patch
deleted file mode 100644
index d5e8976..0000000
--- a/0001-Use-explicit-default-branch-in-autosetup-S-git.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 8b9da98e4c9e256c7c6ecca7f1e5bdbbce29e5da Mon Sep 17 00:00:00 2001
-From: Michal Domonkos <mdomonko@redhat.com>
-Date: Mon, 11 Jul 2022 13:14:49 +0200
-Subject: [PATCH] Use explicit default branch in %autosetup -S git
-
-Commit 3a6b1d8fbf846d3f1b139d343fdfddebe99ae42b assumed "master" as the
-default git branch to track, however the name can be changed globally,
-so make it explicit.
-
-Given the choice now, go with "main" as the general trend, e.g:
-https://fedoraproject.org/wiki/Changes/GitRepos-master-to-main
----
- macros.in | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/macros.in b/macros.in
-index 406622d2f..cf4f77331 100644
---- a/macros.in
-+++ b/macros.in
-@@ -1163,7 +1163,7 @@ package or when debugging this package.\
- 
- # Git
- %__scm_setup_git(q)\
--%{__git} init %{-q}\
-+%{__git} init %{-q} --initial-branch=main\
- %{__git} config user.name "%{__scm_username}"\
- %{__git} config user.email "%{__scm_usermail}"\
- %{__git} config gc.auto 0\
-@@ -1172,7 +1172,7 @@ package or when debugging this package.\
- 	--author "%{__scm_author}" -m "%{NAME}-%{VERSION} base"\
- %{__git} branch rpm-build \
- %{__git} checkout rpm-build \
--%{__git} branch --set-upstream-to=master
-+%{__git} branch --set-upstream-to=main
- 
- %__scm_apply_git(qp:m:)\
- %{__git} apply --index --reject %{-p:-p%{-p*}} -\
--- 
-2.36.1
-
diff --git a/rpm-4.17.1-revert-autopatch-branch.patch b/rpm-4.17.1-revert-autopatch-branch.patch
new file mode 100644
index 0000000..4d028f6
--- /dev/null
+++ b/rpm-4.17.1-revert-autopatch-branch.patch
@@ -0,0 +1,15 @@
+diff -up rpm-4.17.1/macros.in.orig rpm-4.17.1/macros.in
+--- rpm-4.17.1/macros.in.orig	2022-08-02 14:19:36.496729048 +0200
++++ rpm-4.17.1/macros.in	2022-08-02 14:19:56.270615191 +0200
+@@ -1166,10 +1166,7 @@ package or when debugging this package.\
+ %{__git} config gc.auto 0\
+ %{__git} add --force .\
+ %{__git} commit %{-q} --allow-empty -a\\\
+-	--author "%{__scm_author}" -m "%{NAME}-%{VERSION} base"\
+-%{__git} branch rpm-build \
+-%{__git} checkout rpm-build \
+-%{__git} branch --set-upstream-to=master
++	--author "%{__scm_author}" -m "%{NAME}-%{VERSION} base"
+ 
+ %__scm_apply_git(qp:m:)\
+ %{__git} apply --index --reject %{-p:-p%{-p*}} -\
diff --git a/rpm.spec b/rpm.spec
index 6f12b1c..da678af 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -30,7 +30,7 @@
 
 %global rpmver 4.17.1
 #global snapver rc1
-%global rel 2
+%global rel 3
 %global sover 9
 
 %global srcver %{rpmver}%{?snapver:-%{snapver}}
@@ -51,12 +51,13 @@ Patch1: rpm-4.17.x-siteconfig.patch
 Patch3: rpm-4.9.90-no-man-dirs.patch
 
 # Patches already upstream:
-Patch100: 0001-Use-explicit-default-branch-in-autosetup-S-git.patch
 
 # These are not yet upstream
 Patch906: rpm-4.7.1-geode-i686.patch
 # Probably to be upstreamed in slightly different form
 Patch907: rpm-4.15.x-ldflags.patch
+# Hotfix, needs revert or fix upstream
+Patch908: rpm-4.17.1-revert-autopatch-branch.patch
 
 # Partially GPL/LGPL dual-licensed and some bits with BSD
 # SourceLicense: (GPLv2+ and LGPLv2+ with exceptions) and BSD
@@ -580,6 +581,9 @@ fi
 %doc docs/librpm/html/*
 
 %changelog
+* Tue Aug 02 2022 Michal Domonkos <mdomonko@redhat.com> - 4.17.1-3
+- Revert %%autosetup -S git patch due to another regression
+
 * Mon Jul 11 2022 Michal Domonkos <mdomonko@redhat.com> - 4.17.1-2
 - Fix %%autosetup -S git regression wrt default git branch