Update to new pymod2pkg / renderspec releases

Change-Id: Iea61183c236ff689675ed5e0868c09ea2fc6a75c

openstack/pymod2pkg/pymod2pkg.spec.j2

@@ -1,6 +1,6 @@
 %global sname pymod2pkg
 {% set pypi_name = 'pymod2pkg' %}
-{% set upstream_version = upstream_version('0.26.0') %}
+{% set upstream_version = upstream_version('0.28.0') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 Name:           {{ py2name() }}
@@ -11,7 +11,6 @@ License:        {{ license('Apache-2.0') }}
 Group:          Development/Libraries/Python
 URL:            https://wiki.openstack.org/wiki/Rpm-packaging
 Source0:        {{ source }}
-Patch1:         0001-add-suse_py39-flavor-to-explicitly-render-templates-.patch
 BuildRequires:  openstack-macros
 BuildRequires:  {{ py3('distro') }}
 BuildRequires:  {{ py3('pbr') }}
@@ -68,6 +67,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
 %license LICENSE
 %doc README*
 %{_bindir}/pymod2pkg
+%{_bindir}/reqs2pkg
 %{python3_sitelib}/pymod2pkg
 %{python3_sitelib}/pymod2pkg-%{version}*-info
 

openstack/renderspec/0001-Allow-selecting-suse_39-template.patch

@@ -1,44 +0,0 @@
-From b9145d5d4d4d660c1a236f9866265e5e51ca8b70 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Dirk=20M=C3=BCller?= <dirk@dmllr.de>
-Date: Fri, 3 Mar 2023 21:51:42 +0100
-Subject: [PATCH] Allow selecting suse_39 template
-
-Change-Id: Ib16122c5b25cf8f83f27a83ef49ee75643bbc7ba
----
- renderspec/__init__.py     | 2 +-
- renderspec/contextfuncs.py | 6 +++---
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/renderspec/__init__.py b/renderspec/__init__.py
-index 0594584..2effa8c 100644
---- a/renderspec/__init__.py
-+++ b/renderspec/__init__.py
-@@ -172,7 +172,7 @@ def process_args():
-                         "default: autodetect")
-     parser.add_argument("--spec-style", help="distro style you want to use. "
-                         "default: %s" % (distro), default=distro,
--                        choices=['suse', 'fedora'])
-+                        choices=['suse', 'suse_py39', 'fedora'])
-     parser.add_argument("--skip-pyversion",
-                         help='Skip requirements for this pyversion',
-                         default=_get_default_pyskips(distro),
-diff --git a/renderspec/contextfuncs.py b/renderspec/contextfuncs.py
-index 023e688..b2c3aea 100644
---- a/renderspec/contextfuncs.py
-+++ b/renderspec/contextfuncs.py
-@@ -250,9 +250,9 @@ def _context_license_spdx(context, value):
- 
-     if context['spec_style'] == 'fedora':
-         return mapping[value]
--    else:
--        # just use the spdx license name
--        return value
-+
-+    # just use the spdx license name
-+    return value
- 
- 
- ###############
--- 
-2.39.2
-

openstack/renderspec/renderspec.spec.j2

@@ -1,5 +1,5 @@
 {% set pypi_name = 'renderspec' %}
-{% set upstream_version = upstream_version('2.2.0') %}
+{% set upstream_version = upstream_version('2.3.0') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 
@@ -12,7 +12,6 @@ License:        {{ license('Apache-2.0') }}
 Group:          Development/Languages/Python
 URL:            https://docs.openstack.org/{{ pypi_name }}
 Source0:        https://files.pythonhosted.org/packages/source/r/{{ pypi_name }}/{{ pypi_name }}-%{version}.tar.gz
-Patch1:         0001-Allow-selecting-suse_39-template.patch
 BuildRequires:  openstack-macros
 BuildRequires:  {{ py3('Jinja2') }}
 BuildRequires:  {{ py3('ddt') }}
@@ -72,7 +71,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
 %doc README.rst ChangeLog
 %{_bindir}/{{ pypi_name }}
 %{python3_sitelib}/{{ pypi_name }}
-%{python3_sitelib}/*.egg-info
+%{python3_sitelib}/renderspec-%{version}-py*.egg-info
 
 %files -n {{ py2name() }}-doc
 %doc doc/build/html