diff --git a/.gitignore b/.gitignore index 397aa51..a939529 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/virt-firmware-v1.6.tar.gz +SOURCES/virt-firmware-23.6.tar.gz diff --git a/.python-virt-firmware.metadata b/.python-virt-firmware.metadata index 749538f..3d82782 100644 --- a/.python-virt-firmware.metadata +++ b/.python-virt-firmware.metadata @@ -1 +1 @@ -66497d46df1c46543e71526530192ee296469cc4 SOURCES/virt-firmware-v1.6.tar.gz +50f76b30a0238800fef1fda39e40fa040d4d2a2d SOURCES/virt-firmware-23.6.tar.gz diff --git a/SOURCES/0001-setup.cfg-drop-peutils.patch b/SOURCES/0001-setup.cfg-drop-peutils.patch deleted file mode 100644 index c7243b5..0000000 --- a/SOURCES/0001-setup.cfg-drop-peutils.patch +++ /dev/null @@ -1,37 +0,0 @@ -From b6db3b1366fe61a7cbe176c92420076bc6aa5936 Mon Sep 17 00:00:00 2001 -From: Gerd Hoffmann -Date: Mon, 14 Nov 2022 15:58:07 +0100 -Subject: [PATCH] setup.cfg: drop peutils - ---- - setup.cfg | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/setup.cfg b/setup.cfg -index 5f57feac114d..307d6e279d4c 100644 ---- a/setup.cfg -+++ b/setup.cfg -@@ -17,10 +17,8 @@ packages = - virt/firmware - virt/firmware/efi - virt/firmware/varstore -- virt/peutils - install_requires = - cryptography -- pefile - - [options.entry_points] - console_scripts = -@@ -29,9 +27,6 @@ console_scripts = - virt-fw-dump = virt.firmware.dump:main - virt-fw-sigdb = virt.firmware.sigdb:main - migrate-vars = virt.firmware.migrate:main -- pe-dumpinfo = virt.peutils.peutils:pe_dumpinfo -- pe-listsigs = virt.peutils.peutils:pe_listsigs -- pe-addsigs = virt.peutils.peutils:pe_addsigs - - [options.package_data] - virt/firmware = certs/*.pem, aws/dict.v0 --- -2.38.1 - diff --git a/SPECS/python-virt-firmware.spec b/SPECS/python-virt-firmware.spec index d961bb7..f6fe132 100644 --- a/SPECS/python-virt-firmware.spec +++ b/SPECS/python-virt-firmware.spec @@ -1,4 +1,4 @@ -%global pypi_version 1.6 +%global pypi_version 23.6 Name: python-virt-firmware Version: %{pypi_version} @@ -6,9 +6,8 @@ Release: 2%{?dist} Summary: Tools for virtual machine firmware volumes License: GPLv2 -URL: https://gitlab.com/kraxel/virt-firmware -Source0: https://gitlab.com/kraxel/virt-firmware/-/archive/v%{pypi_version}/virt-firmware-v%{pypi_version}.tar.gz -Patch1: 0001-setup.cfg-drop-peutils.patch +URL: https://pypi.org/project/virt-firmware/ +Source0: virt-firmware-%{pypi_version}.tar.gz BuildArch: noarch BuildRequires: python3-devel @@ -28,6 +27,7 @@ Summary: %{summary} Provides: virt-firmware Requires: python3dist(cryptography) Requires: python3dist(setuptools) +Requires: python3dist(pefile) %description -n python3-virt-firmware Tools for ovmf / armvirt firmware volumes This is a small collection of tools for edk2 firmware images. They support decoding and printing the content of @@ -43,7 +43,7 @@ Requires: edk2-ovmf test cases %prep -%autosetup -n virt-firmware-v%{pypi_version} +%autosetup -n virt-firmware-%{pypi_version} %build %py3_build @@ -64,15 +64,33 @@ cp -ar tests %{buildroot}%{_datadir}/%{name} %{_bindir}/virt-fw-dump %{_bindir}/virt-fw-vars %{_bindir}/virt-fw-sigdb +%{_bindir}/kernel-bootcfg +%{_bindir}/uefi-boot-menu %{_bindir}/migrate-vars +%{_bindir}/pe-dumpinfo +%{_bindir}/pe-listsigs +%{_bindir}/pe-addsigs %{_mandir}/man1/virt-*.1* %{python3_sitelib}/virt/firmware +%{python3_sitelib}/virt/peutils %{python3_sitelib}/virt_firmware-%{pypi_version}-py%{python3_version}.egg-info %files -n python3-virt-firmware-tests %{_datadir}/%{name}/tests %changelog +* Tue Jun 27 2023 Gerd Hoffmann - 23.6-2 +- drop -peutils subpackage + +* Thu May 04 2023 Gerd Hoffmann - 23.5-1 +- update to version 23.5 +- resolves: rhbz#2193089 + +* Fri Apr 14 2023 Gerd Hoffmann - 23.4-1 +- update to version 23.4 +- resolves: rhbz#2186770 +- resolves: rhbz#2143566 + * Tue Nov 15 2022 Gerd Hoffmann - 1.6-2 - add tests.yml