From 9d1d240447d201fedd0617d8fcbd0144e8f0bd2a Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa13@gmail.com>
Date: Wed, 20 Jan 2021 07:01:52 -0500
Subject: [PATCH] Force legacy datestamp by default until rhbz#1715412 is
 resolved

---
 ...estamp-while-RHBZ-1715412-is-still-a.patch | 39 +++++++++++++++++++
 rpmdevtools.spec                              |  5 +++
 2 files changed, 44 insertions(+)
 create mode 100644 0001-Force-legacy-datestamp-while-RHBZ-1715412-is-still-a.patch

diff --git a/0001-Force-legacy-datestamp-while-RHBZ-1715412-is-still-a.patch b/0001-Force-legacy-datestamp-while-RHBZ-1715412-is-still-a.patch
new file mode 100644
index 0000000..f59bdfd
--- /dev/null
+++ b/0001-Force-legacy-datestamp-while-RHBZ-1715412-is-still-a.patch
@@ -0,0 +1,39 @@
+From 4a4693c842b6da5d66e3a6bdb1eb7914d2402f7f Mon Sep 17 00:00:00 2001
+From: Neal Gompa <ngompa13@gmail.com>
+Date: Wed, 20 Jan 2021 06:50:03 -0500
+Subject: [PATCH] Force legacy datestamp while RHBZ#1715412 is still an issue
+
+---
+ rpmdev-bumpspec   | 2 +-
+ rpmdev-newspec.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/rpmdev-bumpspec b/rpmdev-bumpspec
+index dc4eb05..3e18b41 100755
+--- a/rpmdev-bumpspec
++++ b/rpmdev-bumpspec
+@@ -300,7 +300,7 @@ the Free Software Foundation; either version 2 of the License, or
+     parser.add_option("-n", "--new",
+                       help="set new version and reset/set release "
+                       "(simple spec files only)")
+-    parser.add_option("-D", "--legacy-datestamp", default=False, action='store_true',
++    parser.add_option("-D", "--legacy-datestamp", default=True, action='store_true',
+                       help="use legacy datestamp for changelog entries")
+     parser.add_option("-d", "--datestamp",
+                       help="changelog date string (default: today)")
+diff --git a/rpmdev-newspec.in b/rpmdev-newspec.in
+index 27af10f..a083dd9 100644
+--- a/rpmdev-newspec.in
++++ b/rpmdev-newspec.in
+@@ -293,7 +293,7 @@ if [[ $NEWSPEC_PREFER_MACROS ]] ; then
+ "
+ fi
+ 
+-if [[ $rpmver -ge 41400 ]] && [[ -z $NEWSPEC_LEGACY_DATESTAMP ]] ; then # >= 4.14 (RHEL >= 8, Fedora >= 27)
++if [[ $rpmver -ge 41400 ]] && [[ $(/bin/false) ]] ; then # >= 4.14 (RHEL >= 8, Fedora >= 27)
+     chlog="s|^%changelog\\s*|%changelog\\n* $(LC_ALL=C date +'%a %b %d %T %Z %Y') $(rpmdev-packager)\\n- |Mg"
+ else
+     chlog="s|^%changelog\\s*|%changelog\\n* $(LC_ALL=C date --utc +'%a %b %d %Y') $(rpmdev-packager)\\n- |Mg"
+-- 
+2.29.2
+
diff --git a/rpmdevtools.spec b/rpmdevtools.spec
index 8277b6e..0b47787 100644
--- a/rpmdevtools.spec
+++ b/rpmdevtools.spec
@@ -8,6 +8,10 @@ License:        GPLv2+ and GPLv2
 URL:            https://pagure.io/rpmdevtools
 Source0:        https://releases.pagure.org/rpmdevtools/%{name}-%{version}.tar.xz
 
+# Fedora-specific downstream patches
+## Force legacy datestamp by default until rhbz#1715412 is resolved
+Patch1001:      0001-Force-legacy-datestamp-while-RHBZ-1715412-is-still-a.patch
+
 BuildArch:      noarch
 # help2man, pod2man, *python for creating man pages
 BuildRequires:  make
@@ -114,6 +118,7 @@ echo ".so man1/rpmdev-spectool.1" > %{buildroot}%{_mandir}/man1/spectool.1
 %changelog
 * Wed Jan 20 2021 Neal Gompa <ngompa13@gmail.com> - 9.3-1
 - Update to 9.3
+- Force legacy datestamp by default until rhbz#1715412 is resolved
 
 * Mon Oct 05 2020 Neal Gompa <ngompa13@gmail.com> - 9.2-1
 - Update to 9.2