import RHEL 10 Beta ddiskit-3.6-25.20191129gitde1f684.el10

.ddiskit.metadata

@@ -1 +0,0 @@
-04bd763fa8c4f56257018c21f9825043de70669d SOURCES/ddiskit-d857c7726fd55e613bbd7af6c842ddfc80a9fdc8.tar.bz2

.gitignore

@@ -1 +1 @@
-SOURCES/ddiskit-d857c7726fd55e613bbd7af6c842ddfc80a9fdc8.tar.bz2
+ddiskit-de1f6847223085dcdd177e02a7298c835fae12a3.tar.gz

SOURCES/0002-kernel-version-re-fix.patch

@@ -1,14 +0,0 @@
-Index: ddiskit-de1f6847223085dcdd177e02a7298c835fae12a3/ddiskit.config
-===================================================================
---- ddiskit-de1f6847223085dcdd177e02a7298c835fae12a3.orig/ddiskit.config	2022-07-12 02:04:24.700230196 +0200
-+++ ddiskit-de1f6847223085dcdd177e02a7298c835fae12a3/ddiskit.config	2022-07-12 02:07:27.444095264 +0200
-@@ -4,6 +4,9 @@
- major = 7
- minor = 0
- 
-+kernel_dist_re = (?P<rpm_dist>\.el([6-9]|[1-9][0-9])(_(0|[1-9][0-9]*))?)
-+kernel_flex_version_re = {kernel_nvr_re}(?P<rpm_release_aux>(\.[0-9]{1,3})*){kernel_dist_re}
-+
- ## Path to the spec file
- spec_path = rpm/SPECS/{spec_file.rpm_name}.spec
-

ddiskit.spec

@@ -1,29 +1,23 @@
 # Use the forge macros to simplify packaging.
 # See https://fedoraproject.org/wiki/Forge-hosted_projects_packaging_automation 
-%global forgeurl https://gitlab.com/redhat/centos-stream/src/dup/ddiskit
+%global forgeurl https://github.com/orosp/ddiskit
 # When we no longer need to build against a git commit, 
 # Simply remove the commit variable and update the Version
 # Then forge will pick up the release
-%global commit d857c7726fd55e613bbd7af6c842ddfc80a9fdc8
+%global commit de1f6847223085dcdd177e02a7298c835fae12a3
-# Old versions of forge.lua incorrectly generate source archive name
-# for the nested project URLs.
-%global forgesource ddiskit-%{commit}.tar.bz2
-%global topdir ddiskit-%{commit}
 
 Name:           ddiskit
 Version:        3.6
 
 %forgemeta
 
-Release:        17%{?dist}
+Release:        25%{?dist}
 Summary:        Tool for Red Hat Enterprise Linux Driver Update Disk creation
 
-License:        GPLv3
+License:        GPL-3.0-only
 URL:            %{forgeurl}
 Source0:        %{forgesource}
 
-Patch0002:      0002-kernel-version-re-fix.patch
-
 BuildArch:      noarch
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
@@ -41,8 +35,9 @@ kernel modules.
 
 %prep
 %forgesetup
-
+# Fix build with setuptools 62.1
-%patch0002 -p1
+# https://github.com/orosp/ddiskit/issues/17
+sed -i "8i packages=[]," setup.py
 
 %build
 %py3_build
@@ -51,10 +46,13 @@ kernel modules.
 %py3_install
 find %{buildroot} -size 0 -delete
 
+%check
+%{__python3} setup.py test
+
 %files -n %{name}
 %doc README
 %license COPYING
-%{python3_sitelib}/*
+%{python3_sitelib}/ddiskit-*.egg-info
 %{_bindir}/ddiskit
 %{_mandir}/man1/ddiskit.1*
 %{_datadir}/bash-completion/completions/ddiskit
@@ -73,26 +71,49 @@ find %{buildroot} -size 0 -delete
 %config(noreplace) /etc/ddiskit.config
 
 %changelog
-* Thu Feb 06 2025 Eugene Syromiatnikov <esyr@redhat.com> - 3.6-17
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 3.6-25
-- Update to the latest version (RHEL-77191).
+- Bump release for June 2024 mass rebuild
 
-* Mon Jul 11 2022 Eugene Syromiatnikov <esyr@redhat.com> - 3.6-16
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.6-24
-- Update kernel version RE for RHEL 9 idiosyncrasies (#2101634).
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 
-* Mon Feb 14 2022 Eugene Syromiatnikov <esyr@redhat.com> - 3.6-15
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.6-23
-- Support kernel-abi-stablelists package usage in RHEL 9 (#1990207).
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 3.6-14.gitde1f684.gitde1f684
+* Mon Dec 04 2023 Eugene Syromiatnikov <esyr@redhat.com> - 3.6-22
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Migrated to SPDX license
-  Related: rhbz#1991688
 
-* Thu Apr 29 2021 Eugene Syromiatnikov <esyr@redhat.com> - 3.6-13
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.6-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Tue Jun 13 2023 Python Maint <python-maint@redhat.com> - 3.6-20
+- Rebuilt for Python 3.12
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.6-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.6-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Tue Jun 21 2022 Lumír Balhar <lbalhar@redhat.com> - 3.6-17
+- Fix build with new setuptools
+
+* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 3.6-16
+- Rebuilt for Python 3.11
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.6-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.6-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 3.6-13
+- Rebuilt for Python 3.10
+
+* Thu Apr 29 2021 Eugene Syromiatnikov <esyr@redhat.com> - 3.6-12
 - Change "Requires: genisoimage" dependency to "Requires: /usr/bin/mkisofs"
   to enable xorriso-provided drop-in replacement implementation usage.
 
-* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 3.6-12
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.6-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 

sources

@@ -0,0 +1 @@
+SHA512 (ddiskit-de1f6847223085dcdd177e02a7298c835fae12a3.tar.gz) = 1b3d7dc10ab85c4b3a876cf6afb530baf0d5dd260cfdb51a3ef3b2906f3f163f86c40f3c2d05114cf3fb0bf79120d446aff8c4589e321ac9b9fafc015104a006