.fmf/version

@@ -1 +0,0 @@
-1

.gitignore

@@ -6,4 +6,3 @@
 /1.2.1.tar.gz
 /1.2.2.tar.gz
 /1.2.3.tar.gz
-/isomd5sum-1.2.5.tar.gz

gating.yaml

@@ -1,6 +1,6 @@
 --- !Policy
 product_versions:
-  - rhel-10
+  - rhel-8
 decision_context: osci_compose_gate
 rules:
   - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

isomd5sum.spec

@@ -1,21 +1,23 @@
-%global forgeurl https://github.com/rhinstaller/isomd5sum
+%if 0%{?rhel} > 7
+# Disable python2 build by default
+%bcond_with python2
+%else
+%bcond_without python2
+%endif
 
 Summary: Utilities for working with md5sum implanted in ISO images
 Name:    isomd5sum
-Version: 1.2.5
+Version: 1.2.3
 Release: 3%{?dist}
 Epoch: 1
-License: GPL-2.0-or-later
+License: GPLv2+
+Group: Applications/System
 
-%global tag %{version}
+Url:     https://github.com/rhinstaller/isomd5sum
-%forgemeta
+Source0: https://github.com/rhinstaller/%{name}/archive/%{version}.tar.gz
-Url:     %{forgeurl}
-Source0: %{forgesource}
 
 BuildRequires: gcc
 BuildRequires: popt-devel
-BuildRequires: python3-devel
-BuildRequires: make
 
 %description
 The isomd5sum package contains utilities for implanting and verifying
@@ -23,6 +25,7 @@ an md5sum implanted into an ISO9660 image.
 
 %package devel
 Summary: Development headers and library for using isomd5sum 
+Group: Development/System
 Requires: %{name} = %{epoch}:%{version}-%{release}
 Provides: %{name}-static = %{epoch}:%{version}-%{release}
 
@@ -30,8 +33,24 @@ Provides: %{name}-static = %{epoch}:%{version}-%{release}
 This contains header files and a library for working with the isomd5sum
 implanting and checking.
 
+%if %{with python2}
+%package -n python2-isomd5sum
+Summary: Python bindings for isomd5sum
+
+BuildRequires: python2-devel
+
+%{?python_provide:%python_provide python2-isomd5sum}
+
+%description -n python2-isomd5sum
+The isomd5sum package contains utilities for implanting and verifying
+an md5sum implanted into an ISO9660 image.
+%endif # with python2
+
 %package -n python3-isomd5sum
 Summary: Python bindings for isomd5sum
+%{?python_provide:%python_provide python3-isomd5sum}
+
+BuildRequires: python3-devel
 
 %description -n python3-isomd5sum
 The isomd5sum package contains utilities for implanting and verifying
@@ -39,16 +58,21 @@ an md5sum implanted into an ISO9660 image.
 
 
 %prep
-%forgeautosetup
+%autosetup
-
 
 %build
 CFLAGS="$RPM_OPT_FLAGS -Wno-strict-aliasing"; export CFLAGS
 LDFLAGS="$RPM_LD_FLAGS"; export LDFLAGS
+%if %{with python2}
+PYTHON=%{__python2} make checkisomd5 implantisomd5 pyisomd5sum.so
+%endif # with python2
 
 PYTHON=%{__python3} make checkisomd5 implantisomd5 pyisomd5sum.so
 
 %install
+%if %{with python2}
+PYTHON=%{__python2} make DESTDIR=$RPM_BUILD_ROOT install-bin install-devel install-python
+%endif # with python2
 
 PYTHON=%{__python3} make DESTDIR=$RPM_BUILD_ROOT install-bin install-devel install-python
 
@@ -63,99 +87,20 @@ PYTHON=%{__python3} make DESTDIR=$RPM_BUILD_ROOT install-bin install-devel insta
 %{_libdir}/*.a
 /usr/share/pkgconfig/isomd5sum.pc
 
+%if %{with python2}
+%files -n python2-isomd5sum
+%{python2_sitearch}/pyisomd5sum.so
+%endif # with python2
+
 %files -n python3-isomd5sum
 %{python3_sitearch}/pyisomd5sum.so
 
 %changelog
-* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1:1.2.5-3
+* Mon May 28 2018 Charalampos Stratakis <cstratak@redhat.com> - 1:1.2.3-3
-- Bump release for October 2024 mass rebuild:
+- Conditionalize the python2 subpackage
-  Resolves: RHEL-64018
 
-* Wed Jun 26 2024 Brian C. Lane <bcl@redhat.com> - 1.2.5-2
+* Mon May 28 2018 Charalampos Stratakis <cstratak@redhat.com> - 1:1.2.3-2
-- Rebuild to force gating to use new gating config
+- Conditionalize the python2 subpackage
-  (changed genisoimage to xorriso for tests)
-
-* Tue Jun 25 2024 Brian C. Lane <bcl@redhat.com> - 1.2.5-1
-- New Version 1.2.5 (bcl)
-  Resolves: RHEL-45005
-- testpyisomd5sum.py: Use a consistent iso size (bcl)
-- Remove quiet from iso creation, size seems wrong (bcl)
-- workflows: Move to Fedora 39 and checkout v4 (bcl)
-- Add support for riscv64 (davidlt)
-- workflows: Update to use actions/checkout (bcl)
-- Add a GitHub Action to run tests (bcl)
-- Add mips64 (wangray1021)
-- testpyisomd5sum.py: Support genisoimage, Python 2 (ryan)
-
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1:1.2.3-24
-- Bump release for June 2024 mass rebuild
-
-* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.2.3-23
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.2.3-22
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.2.3-21
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Tue Jun 13 2023 Python Maint <python-maint@redhat.com> - 1:1.2.3-20
-- Rebuilt for Python 3.12
-
-* Mon Jan 30 2023 Brian C. Lane <bcl@redhat.com> - 1.2.3-19
-- SPDX migration
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.2.3-18
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.2.3-17
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 1:1.2.3-16
-- Rebuilt for Python 3.11
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.2.3-15
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.2.3-14
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 1:1.2.3-13
-- Rebuilt for Python 3.10
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.2.3-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Dec 01 2020 Brian C. Lane <bcl@redhat.com> - 1.2.3-11
-- Add make to BuildRequires
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.2.3-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 1:1.2.3-9
-- Rebuilt for Python 3.9
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.2.3-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 1:1.2.3-7
-- Rebuilt for Python 3.8
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.2.3-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.2.3-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Mon Jan 14 2019 Miro Hrončok <mhroncok@redhat.com> - 1:1.2.3-4
-- Subpackage python2-isomd5sum has been removed
-  See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.2.3-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 1:1.2.3-2
-- Rebuilt for Python 3.7
 
 * Tue Apr 10 2018 Brian C. Lane <bcl@redhat.com> - 1:1.2.3-1
 - New Version 1.2.3 (bcl)

plans/smoke.fmf

@@ -1,7 +0,0 @@
-summary: Smoke tests for isomd5sum tools
-
-discover:
-    how: fmf
-
-execute:
-    how: tmt

sources

@@ -1 +1 @@
-SHA512 (isomd5sum-1.2.5.tar.gz) = aa6bb16be18b42925ac1834aa4d558fafdba7751639acfb7344a79f7ead1125d810f13c442458526f394d8790369b1c48ab41cb73881808740263161caa99655
+SHA512 (1.2.3.tar.gz) = a500faa368377c8fb5dfc311bc3a6dbadd253e6af7928b691d1fc11e25b69819a611f72fa201e70f5df257cdc491c97d1f612bb179fa49de1fb0a638d6ac7972

tests/gating.yaml

@@ -0,0 +1,6 @@
+--- !Policy
+product_versions:
+  - rhel-8
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

tests/smoke.fmf

@@ -1,6 +0,0 @@
-summary: Basic smoke test
-contact: Radek Vykydal <rvykydal@redhat.com>
-path: /tests
-test: ./smoke.sh
-duration: 30m
-require: [xorriso, coreutils, isomd5sum]

tests/tests.yml

@@ -0,0 +1,10 @@
+- hosts: localhost
+  roles:
+  - role: standard-test-basic
+    tags:
+    - classic
+    tests:
+    - cmd-line
+    required_packages:
+    - genisoimage
+    - coreutils