diff --git a/.gitignore b/.gitignore index 97f67f5..e45dded 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ virt-firmware-v1.2.tar.gz virt-firmware-v1.6.tar.gz +/virt-firmware-23.4.tar.gz diff --git a/0001-setup.cfg-drop-peutils.patch b/0001-setup.cfg-drop-peutils.patch index c7243b5..73bfde2 100644 --- a/0001-setup.cfg-drop-peutils.patch +++ b/0001-setup.cfg-drop-peutils.patch @@ -1,37 +1,25 @@ -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 +diff -up virt-firmware-23.4/setup.cfg.orig virt-firmware-23.4/setup.cfg +--- virt-firmware-23.4/setup.cfg.orig 2023-04-14 09:50:34.055045800 +0200 ++++ virt-firmware-23.4/setup.cfg 2023-04-14 14:00:36.986635224 +0200 +@@ -17,11 +17,9 @@ packages = + virt/firmware + virt/firmware/efi + virt/firmware/varstore +- virt/peutils + install_requires = + setuptools + 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 + console_scripts = +@@ -30,9 +28,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/python-virt-firmware.spec b/python-virt-firmware.spec index d961bb7..d850116 100644 --- a/python-virt-firmware.spec +++ b/python-virt-firmware.spec @@ -1,13 +1,13 @@ -%global pypi_version 1.6 +%global pypi_version 23.4 Name: python-virt-firmware Version: %{pypi_version} -Release: 2%{?dist} +Release: 1%{?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 +URL: https://pypi.org/project/virt-firmware/ +Source0: virt-firmware-%{pypi_version}.tar.gz Patch1: 0001-setup.cfg-drop-peutils.patch BuildArch: noarch @@ -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 @@ -54,6 +54,7 @@ test cases install -m 755 -d %{buildroot}%{_mandir}/man1 install -m 644 man/*.1 %{buildroot}%{_mandir}/man1 # tests +rm -f tests/test-pe.sh mkdir -p %{buildroot}%{_datadir}/%{name} cp -ar tests %{buildroot}%{_datadir}/%{name} @@ -73,6 +74,11 @@ cp -ar tests %{buildroot}%{_datadir}/%{name} %{_datadir}/%{name}/tests %changelog +* 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 diff --git a/sources b/sources index d851a50..e87c691 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (virt-firmware-v1.6.tar.gz) = bcd57ceba993f1fa34d28591a88dcb1a29196dc83a4acf3c749da5c0bd3cf169e8d4d5b2a78dd87fb1e2983f7e2e046565a3d42e2480791cb62a55022facbd2c +SHA512 (virt-firmware-23.4.tar.gz) = a4724cdcf03175aa30e15f7ad515eefb28ad30ae21a3a70a01782ff0a281b824ea0d820d86313f7568d375dfd3ecc4e79acfd35ea00761d2df4e2aad56b92203