0001-Increase-the-upper-limit-version-of-flake8.patch

@@ -1,23 +0,0 @@
-From b727fc3b0c299caf697688964b9e24acf53f7f2c Mon Sep 17 00:00:00 2001
-From: desert-sailor <dxwangk@isoftstone.com>
-Date: Fri, 8 Sep 2023 10:17:17 +0800
-Subject: [PATCH] Increase the upper limit version of flake8 to 7.0.0
-
----
- requirements.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/requirements.txt b/requirements.txt
-index 067d95f..0aefaff 100644
---- a/requirements.txt
-+++ b/requirements.txt
-@@ -7,5 +7,5 @@ pbr!=2.1.0,>=2.0.0 # Apache-2.0
- PyYAML>=3.12 # MIT
- stevedore>=1.20.0 # Apache-2.0
- # NOTE(ianw) in here because dib-lint uses flake8
--flake8<6.0.0,>=3.6.0 # MIT
-+flake8<=7.0.0,>=3.6.0 # MIT
- jsonschema>=3.0.2 # MIT
--- 
-2.33.0
-

diskimage-builder.spec

@@ -1,17 +1,12 @@
 %global _empty_manifest_terminate_build 0
-Name:       diskimage-builder
-Version:    3.31.0
-Release:    2
-Summary:    olden Disk Image builder.
-License:    Apache-2.0
-URL:        https://docs.openstack.org/diskimage-builder
-Source0:    https://files.pythonhosted.org/packages/6c/1f/ba8b6fdae713d83f4e2eed27db36eccf9073d2d4cfc88bad800ad0b6093d/diskimage-builder-3.31.0.tar.gz
-
-# Increase upper version to fix install because python-flake8 has been
-# upgraded to 6.1.0
-Patch0:     0001-Increase-the-upper-limit-version-of-flake8.patch
-
-BuildArch:  noarch
+Name:		diskimage-builder
+Version:	3.7.0
+Release:	1
+Summary:	Golden Disk Image builder.
+License:	ASL 2.0
+URL:		https://docs.openstack.org/diskimage-builder
+Source0:	https://files.pythonhosted.org/packages/22/18/65e46612652edd6cfb1b7c14ce38a6a90552d797b303bbe7115d667a0be5/diskimage-builder-3.7.0.tar.gz
+BuildArch:	noarch
 
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
@@ -46,7 +41,7 @@ use with OpenStack.
 
 %define __requires_exclude /sbin/runscript
 %prep
-%autosetup -n diskimage-builder-%{version} -p1
+%autosetup -n diskimage-builder-3.7.0
 
 %build
 %py3_build
@@ -86,18 +81,6 @@ mv %{buildroot}/doclist.lst .
 %{_docdir}/*
 
 %changelog
-* Tue Apr 02 2024 zhangxianting <zhangxianting@uniontech.com> - 3.31.0-2
-- Increase the upper limit version of flake8 to fix install, flake8<7.0.0 to flake8<=7.0.0
-
-* Fri Sep 08 2023 Dongxing Wang <dxwangk@isoftstone.com> - 3.31.0-1
-- Upgrade package python3-diskimage-builder to version 3.31.0
-
-* Fri May 12 2023 Han Guangyu <hanguangyu@uniontech.com> - 3.20.3-2
-- Increase the upper limit version of flake8 to fix install
-
-* Mon Jul 04 2022 OpenStack_SIG <openstack@openeuler.org> - 3.20.3-1
-- Upgrade package python3-diskimage-builder to version 3.20.3
-
 * Wed Jul 14 2021 liksh <liks11@chinaunicom.cn> - 3.7.0-1
 - update from 3.2.1 to 3.7.0
 

diskimage-builder.yaml

@@ -1,4 +0,0 @@
-version_control: github
-src_repo: openstack/diskimage-builder
-tag_prefix: 
-separator: "."