add -peutils subpackage

python-virt-firmware.spec

@@ -8,7 +8,6 @@ Summary:        Tools for virtual machine firmware volumes
 License:        GPLv2
 URL:            https://pypi.org/project/virt-firmware/
 Source0:        virt-firmware-%{pypi_version}.tar.gz
-Patch1:         0001-setup.cfg-drop-peutils.patch
 BuildArch:      noarch
 
 BuildRequires:  python3-devel
@@ -34,9 +33,17 @@ for edk2 firmware images. They support decoding and printing the content of
 firmware volumes. Variable stores (OVMF_VARS.fd) can be modified, for example
 to enroll secure boot certificates.
 
+%package -n     python3-virt-firmware-peutils
+Summary:        %{summary} - peutils
+Requires:       python3dist(pefile)
+Conflicts:      python3-virt-firmware < 1.6
+%description -n python3-virt-firmware-peutils
+Some utilities to inspect efi (pe) binaries.
+
 %package -n     python3-virt-firmware-tests
 Summary:        %{summary} - test cases
 Requires:       python3-virt-firmware
+Requires:       python3-virt-firmware-peutils
 Requires:       python3dist(pytest)
 Requires:       edk2-ovmf
 %description -n python3-virt-firmware-tests
@@ -54,7 +61,6 @@ 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}
 
@@ -72,6 +78,12 @@ cp -ar tests %{buildroot}%{_datadir}/%{name}
 %{python3_sitelib}/virt/firmware
 %{python3_sitelib}/virt_firmware-%{pypi_version}-py%{python3_version}.egg-info
 
+%files -n python3-virt-firmware-peutils
+%{python3_sitelib}/virt/peutils
+%{_bindir}/pe-dumpinfo
+%{_bindir}/pe-listsigs
+%{_bindir}/pe-addsigs
+
 %files -n python3-virt-firmware-tests
 %{_datadir}/%{name}/tests
 

tests/tests.yml

@@ -12,5 +12,7 @@
         run: /usr/share/python-virt-firmware/tests/test-sigdb.sh
     - kernel-bootcfg:
         run: /usr/share/python-virt-firmware/tests/test-bootcfg.sh
+    - pe-utils:
+        run: /usr/share/python-virt-firmware/tests/test-pe.sh
     - python-unittest:
         run: python3 /usr/share/python-virt-firmware/tests/tests.py