Update to the latest version
* .gitignore: Remove old records, add ddiskit-710308d70cec15b9a7d1a7b89e6c04aaeb90aeb3.tar.bz2. * 0001-kabi-stablelists.patch: Remove, present upstream in commit 15ec1277e249 "templates/spec: use "stablelist" on RHEL 9+". * 0002-kernel-version-re-fix.patch: Refresh the patch. * 0003-setup_py-fixes.patch: New file, adds empty "packages" argument to the setup() call to avoid setuptools layout autodiscovery. * ddiskit.spec (%forgeurl): Change the URL to https://gitlab.com/redhat/centos-stream/src/dup/ddiskit. (%commit): Change to 710308d70cec15b9a7d1a7b89e6c04aaeb90aeb3. (Patch0001): Remove. (Patch0003): New patch. (Release): Bump to 27. (%prep): Use "%patch -P N" syntax for patches, remove patch 0001, add patch 0003. (%check): Remove, there are no tests present as of right now. (%changelog): Add a record. Resolves: RHEL-55716 Resolves: RHEL-61716 Resolves: RHEL-68669 Signed-off-by: Eugene Syromiatnikov <esyr@redhat.com>
This commit is contained in:
parent
0ea0c9a127
commit
221732d3c7
3
.gitignore
vendored
3
.gitignore
vendored
@ -1,2 +1 @@
|
||||
/ddiskit-3.6.tar.gz
|
||||
/ddiskit-de1f6847223085dcdd177e02a7298c835fae12a3.tar.gz
|
||||
/ddiskit-710308d70cec15b9a7d1a7b89e6c04aaeb90aeb3.tar.bz2
|
||||
|
@ -9,6 +9,6 @@ Index: ddiskit-de1f6847223085dcdd177e02a7298c835fae12a3/ddiskit.config
|
||||
+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}
|
||||
+
|
||||
[rpm_gpg_check]
|
||||
## Some initial assumption about the keyring dir
|
||||
keyring_dir = {defaults.res_dir}/keyrings/{defaults.profile}
|
||||
## Path to the spec file
|
||||
spec_path = rpm/SPECS/{spec_file.rpm_name}.spec
|
||||
|
||||
|
11
0003-setup_py-fixes.patch
Normal file
11
0003-setup_py-fixes.patch
Normal file
@ -0,0 +1,11 @@
|
||||
Index: ddiskit-4f4b76080f65109188b937c192a23aa0766348cf/setup.py
|
||||
===================================================================
|
||||
--- ddiskit-4f4b76080f65109188b937c192a23aa0766348cf.orig/setup.py 2025-01-13 18:52:40.000000000 +0100
|
||||
+++ ddiskit-4f4b76080f65109188b937c192a23aa0766348cf/setup.py 2025-01-14 12:07:53.034758080 +0100
|
||||
@@ -22,5 +22,6 @@
|
||||
('/usr/share/man/man1', ['ddiskit.1']),
|
||||
('/etc', ['etc/ddiskit.config']),
|
||||
],
|
||||
+ packages=[],
|
||||
scripts=['bin/ddiskit'],
|
||||
)
|
17
ddiskit.spec
17
ddiskit.spec
@ -1,17 +1,17 @@
|
||||
# Use the forge macros to simplify packaging.
|
||||
# See https://fedoraproject.org/wiki/Forge-hosted_projects_packaging_automation
|
||||
%global forgeurl https://github.com/orosp/ddiskit
|
||||
%global forgeurl https://gitlab.com/redhat/centos-stream/src/dup/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 de1f6847223085dcdd177e02a7298c835fae12a3
|
||||
%global commit 710308d70cec15b9a7d1a7b89e6c04aaeb90aeb3
|
||||
|
||||
Name: ddiskit
|
||||
Version: 3.6
|
||||
|
||||
%forgemeta
|
||||
|
||||
Release: 26%{?dist}
|
||||
Release: 27%{?dist}
|
||||
Summary: Tool for Red Hat Enterprise Linux Driver Update Disk creation
|
||||
|
||||
License: GPL-3.0-only
|
||||
@ -19,6 +19,7 @@ URL: %{forgeurl}
|
||||
Source0: %{forgesource}
|
||||
|
||||
Patch0002: 0002-kernel-version-re-fix.patch
|
||||
Patch0003: 0003-setup_py-fixes.patch
|
||||
|
||||
BuildArch: noarch
|
||||
BuildRequires: python3-devel
|
||||
@ -37,11 +38,9 @@ kernel modules.
|
||||
|
||||
%prep
|
||||
%forgesetup
|
||||
# Fix build with setuptools 62.1
|
||||
# https://github.com/orosp/ddiskit/issues/17
|
||||
sed -i "8i packages=[]," setup.py
|
||||
|
||||
%patch -P 0002 -p1
|
||||
%patch -P 0003 -p1
|
||||
|
||||
%build
|
||||
%py3_build
|
||||
@ -50,9 +49,6 @@ sed -i "8i packages=[]," setup.py
|
||||
%py3_install
|
||||
find %{buildroot} -size 0 -delete
|
||||
|
||||
%check
|
||||
%{__python3} setup.py test
|
||||
|
||||
%files -n %{name}
|
||||
%doc README
|
||||
%license COPYING
|
||||
@ -75,6 +71,9 @@ find %{buildroot} -size 0 -delete
|
||||
%config(noreplace) /etc/ddiskit.config
|
||||
|
||||
%changelog
|
||||
* Mon Jan 13 2025 Eugene Syromiatnikov <esyr@redhat.com> - 3.6-27
|
||||
- Update to the latest version (RHEL-55716, RHEL-61716, RHEL-68669).
|
||||
|
||||
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 3.6-26
|
||||
- Bump release for October 2024 mass rebuild:
|
||||
Resolves: RHEL-64018
|
||||
|
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (ddiskit-de1f6847223085dcdd177e02a7298c835fae12a3.tar.gz) = 1b3d7dc10ab85c4b3a876cf6afb530baf0d5dd260cfdb51a3ef3b2906f3f163f86c40f3c2d05114cf3fb0bf79120d446aff8c4589e321ac9b9fafc015104a006
|
||||
SHA512 (ddiskit-710308d70cec15b9a7d1a7b89e6c04aaeb90aeb3.tar.bz2) = 8c2072c89372d8f50997396f709580f1d6dca348d183932b6fae760402d463e2bb222fab04939668618de1a7c221ffc1c154e4e4ad9b048f3b2e375add0ec88c
|
||||
|
Loading…
Reference in New Issue
Block a user