!12 Update to 9.6

From: @wk333 
Reviewed-by: @lyn1001 
Signed-off-by: @lyn1001

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
+

0001-bumpspec-checksig-Avoid-python-3.6-regex-related-dep.patch

@@ -1,44 +0,0 @@
-From 693c9549280b78860b756b593b5922bf3be46888 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
-Date: Wed, 15 Feb 2017 11:19:29 +0200
-Subject: [PATCH] bumpspec, checksig: Avoid python 3.6 regex related
- deprecations
-
----
- rpmdev-bumpspec | 6 ++++--
- rpmdev-checksig | 2 +-
- 2 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/rpmdev-bumpspec b/rpmdev-bumpspec
-index ea2ddd9..35e6c9c 100755
---- a/rpmdev-bumpspec
-+++ b/rpmdev-bumpspec
-@@ -44,8 +44,10 @@ class SpecFile(object):
- 
-     # supported release value macro definitions
-     _macro_bump_patterns = (
--        re.compile(r"^%(?:define|global)\s+(?i)release\s+(\d+.*)"),
--        re.compile(r"^%(?:define|global)\s+(?i)baserelease\s+(\d+.*)"),
-+        re.compile(r"^%(?:define|global)\s+"
-+                   r"[Rr][Ee][Ll][Ee][Aa][Ss][Ee]\s+(\d+.*)"),
-+        re.compile(r"^%(?:define|global)\s+"
-+                   r"[Bb][Aa][Ss][Ee][Rr][Ee][Ll][Ee][Aa][Ss][Ee]\s+(\d+.*)"),
-     )
-     # normal "Release:" tag lines
-     _tag_bump_patterns = (
-diff --git a/rpmdev-checksig b/rpmdev-checksig
-index 0e90fe5..76b5967 100755
---- a/rpmdev-checksig
-+++ b/rpmdev-checksig
-@@ -44,7 +44,7 @@ def lookupKeyID(ts, keyid):
-     mi.pattern('version', rpm.RPMMIRE_STRCMP, keyid)
-     for hdr in mi:
-         sum = hdr['summary']
--        mo = re.search(b'\<.*\>', sum)
-+        mo = re.search(rb'\<.*\>', sum)
-         email = mo.group().decode(errors='replace')
-         return email
- 
--- 
-2.17.1
-

0002-BZ-1851499-port-to-str-return-values.patch

@@ -1,28 +0,0 @@
-diff -up rpmdevtools-8.10/rpmdev-checksig.orig rpmdevtools-8.10/rpmdev-checksig
---- rpmdevtools-8.10/rpmdev-checksig.orig	2020-06-29 10:29:43.936758775 +0200
-+++ rpmdevtools-8.10/rpmdev-checksig	2020-06-29 10:29:55.540983848 +0200
-@@ -44,8 +44,8 @@ def lookupKeyID(ts, keyid):
-     mi.pattern('version', rpm.RPMMIRE_STRCMP, keyid)
-     for hdr in mi:
-         sum = hdr['summary']
--        mo = re.search(rb'\<.*\>', sum)
--        email = mo.group().decode(errors='replace')
-+        mo = re.search('\<.*\>', sum)
-+        email = mo.group()
-         return email
- 
- 
-diff -up rpmdevtools-8.10/rpmdev-rmdevelrpms.py.orig rpmdevtools-8.10/rpmdev-rmdevelrpms.py
---- rpmdevtools-8.10/rpmdev-rmdevelrpms.py.orig	2020-06-29 10:28:59.503896990 +0200
-+++ rpmdevtools-8.10/rpmdev-rmdevelrpms.py	2020-06-29 10:29:09.897098576 +0200
-@@ -42,8 +42,8 @@ dev_re = re.compile("-(?:de(?:buginfo|ve
- test_re = re.compile("^perl-(?:Devel|ExtUtils|Test)-")
- lib_re1 = re.compile("^lib.+")
- lib_re2 = re.compile("-libs?$")
--a_re = re.compile(b"\\w\\.a$")
--so_re = re.compile(b"\\w\\.so(?:\\.\\d+)*$")
-+a_re = re.compile("\\w\\.a$")
-+so_re = re.compile("\\w\\.so(?:\\.\\d+)*$")
- comp_re = re.compile("^compat-gcc")
- # required by Ant, which is required by Eclipse...
- jdev_re = re.compile("^java-.+-gcj-compat-devel$")

0002-rpmdevtools-9.5-no_qa_robot.patch

@@ -0,0 +1,21 @@
+diff -up rpmdevtools-9.5/Makefile.am.orig rpmdevtools-9.5/Makefile.am
+--- rpmdevtools-9.5/Makefile.am.orig	2021-12-10 11:37:29.889405680 +0100
++++ rpmdevtools-9.5/Makefile.am	2021-12-10 11:37:34.637495820 +0100
+@@ -1,4 +1,4 @@
+-SUBDIRS = emacs qa-robot
++SUBDIRS = emacs
+ 
+ pkgsysconfdir = $(sysconfdir)/rpmdevtools
+ bashcompdir = @bashcompdir@
+diff -up rpmdevtools-9.5/Makefile.in.orig rpmdevtools-9.5/Makefile.in
+--- rpmdevtools-9.5/Makefile.in.orig	2021-12-10 11:37:31.073428158 +0100
++++ rpmdevtools-9.5/Makefile.in	2021-12-10 11:37:38.304565439 +0100
+@@ -317,7 +317,7 @@ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = emacs qa-robot
++SUBDIRS = emacs
+ pkgsysconfdir = $(sysconfdir)/rpmdevtools
+ bin_SCRIPTS = rpmdev-newinit rpmdev-newspec rpmdev-rmdevelrpms
+ dist_bin_SCRIPTS = rpmdev-checksig rpmdev-diff rpmdev-extract rpmdev-md5 \

rpmdevtools.spec

@@ -1,36 +1,24 @@
-%global spectool_version 1.0.10
-%bcond_without python3
-
 Name:           rpmdevtools
-Version:        8.10
-Release:        9
+Version:        9.6
+Release:        1
 Summary:        RPM Development Tools
 
 License:        GPLv2+ and GPLv2
 URL:            https://pagure.io/rpmdevtools
 Source0:        https://releases.pagure.org/rpmdevtools/%{name}-%{version}.tar.xz
 
-Patch0001:      0001-bumpspec-checksig-Avoid-python-3.6-regex-related-dep.patch
-#https://pagure.io/fork/mdomonko/rpmdevtools/c/1d092174e75c63de020ecd48cee449d59de2141e
-Patch0002:      0002-BZ-1851499-port-to-str-return-values.patch
-Patch0003:      0003-fix-return-value-error-for-rpminfo.pacth
+Patch0001:      0001-Force-legacy-datestamp-while-RHBZ-1715412-is-still-a.patch
+Patch0002:      0002-rpmdevtools-9.5-no_qa_robot.patch
+Patch0003:      0003-fix-return-value-error-for-rpminfo.patch
 
 BuildArch:      noarch
-%if %{with python3}
-BuildRequires:  python3 rpm-python3
-%else
-BuildRequires:  python >= 2.7 rpm-python
-%endif
 BuildRequires:  emacs-common >= 1:22.3-3 bash-completion perl-generators help2man %{_bindir}/pod2man 
-Provides:       spectool = %{spectool_version}
+BuildRequires:  python3dist(requests) python3dist(rpm) python3-devel python3 python3dist(progressbar2)
 Requires:       curl diffutils fakeroot file findutils gawk grep rpm-build >= 4.4.2.3
-%if %{with python3}
-Requires:       rpm-python3
-%else
-Requires:       python >= 2.4 rpm-python
-%endif
+Requires:       python3dist(argcomplete) python3dist(requests) python3dist(rpm)
 Requires:       sed emacs-filesystem
 
+Recommends:     python%{python3_version}dist(rpmautospec)
 %description
 rpmdevtools contains many scripts to aid in package development.
 rpmdevtools when installed also pulls in (roughly) the explicit minimum build environment as defined in packaging guidelines,
@@ -40,9 +28,7 @@ and contains (X)Emacs helpers that integrates rpm-spec-mode.el with rpmdev-newsp
 
 %prep
 %autosetup -p1
-%if %{with python3}
 grep -lF "%{_bindir}/python " * | xargs sed -i -e "s|%{_bindir}/python |%{_bindir}/python3 |"
-%endif
 
 %build
 %configure --libdir=%{_prefix}/lib
@@ -61,6 +47,9 @@ for dir in %{_emacs_sitestartdir} ; do
   touch $RPM_BUILD_ROOT$dir/rpmdev-init.elc
 done
 
+ln -sr %{buildroot}%{_bindir}/rpmdev-spectool %{buildroot}%{_bindir}/spectool
+echo ".so man1/rpmdev-spectool.1" > %{buildroot}%{_mandir}/man1/spectool.1
+
 %files -f %{name}.files
 %license COPYING
 %doc NEWS
@@ -74,6 +63,9 @@ done
 %{_mandir}/man[18]/*.[18]*
 
 %changelog
+* Mon Oct 23 2023 liyanan  <liyanan61@h-partners.com> - 9.6-1
+- Update to 9.6
+
 * Mon Mar 21 2022 liyanan  <liyanan32@huawei.com> - 8.10-9
 - BZ 1851499 port to str return values
 - fix return value error for rpminfo