From 2dda420214bdb5f34ac2e1aaf5f4c72bb0e20d0a Mon Sep 17 00:00:00 2001 From: eabdullin Date: Tue, 30 Apr 2024 15:15:14 +0000 Subject: [PATCH] import UBI python-rpm-generators-12-9.el9 --- .python-rpm-generators.metadata | 0 SOURCES/pythonbundles.py | 5 ----- SPECS/python-rpm-generators.spec | 6 +++++- 3 files changed, 5 insertions(+), 6 deletions(-) delete mode 100644 .python-rpm-generators.metadata diff --git a/.python-rpm-generators.metadata b/.python-rpm-generators.metadata deleted file mode 100644 index e69de29..0000000 diff --git a/SOURCES/pythonbundles.py b/SOURCES/pythonbundles.py index 96e817e..3d784ae 100755 --- a/SOURCES/pythonbundles.py +++ b/SOURCES/pythonbundles.py @@ -15,12 +15,7 @@ import pathlib import sys -# inject parse_version import to pythondistdeps -# not the nicest API, but :/ -from pkg_resources import parse_version import pythondistdeps -pythondistdeps.parse_version = parse_version - def generate_bundled_provides(path, namespace): provides = set() diff --git a/SPECS/python-rpm-generators.spec b/SPECS/python-rpm-generators.spec index 8999c5d..51dfe87 100644 --- a/SPECS/python-rpm-generators.spec +++ b/SPECS/python-rpm-generators.spec @@ -1,7 +1,7 @@ Name: python-rpm-generators Summary: Dependency generators for Python RPMs Version: 12 -Release: 8%{?dist} +Release: 9%{?dist} # Originally all those files were part of RPM, so license is kept here License: GPLv2+ @@ -47,6 +47,10 @@ install -Dpm0755 -t %{buildroot}%{_rpmconfigdir} *.py %{_rpmconfigdir}/pythonbundles.py %changelog +* Fri Sep 22 2023 Tomáš Hrnčiar - 12-9 +- Avoid needless pkg_resources import in pythonbundles.py +- Resolves: RHEL-6110 + * Wed Jan 26 2022 Tomas Orsava - 12-8 - From `python3-foo` packages automatically generate `python3.X-foo` Obsoletes tags on CentOS/RHEL