From 81a5823faa932eb00f168dedb5b49ce9b5f530d4 Mon Sep 17 00:00:00 2001 From: Lichen Liu Date: Mon, 6 Feb 2023 14:51:48 +0800 Subject: [PATCH] Release: v3.12.3-2 --- .python-dmidecode.metadata | 1 + ...dmi_cache_size_2-will-add-unit-twice.patch | 26 +++++++++++++++++++ python-dmidecode.spec | 7 ++++- 3 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 .python-dmidecode.metadata create mode 100644 0001-Fix-dmi_cache_size_2-will-add-unit-twice.patch diff --git a/.python-dmidecode.metadata b/.python-dmidecode.metadata new file mode 100644 index 0000000..8844250 --- /dev/null +++ b/.python-dmidecode.metadata @@ -0,0 +1 @@ +f06f73840beba1575ff0109c23a9de0e7b8ab21f python-dmidecode-3.12.3.tar.gz diff --git a/0001-Fix-dmi_cache_size_2-will-add-unit-twice.patch b/0001-Fix-dmi_cache_size_2-will-add-unit-twice.patch new file mode 100644 index 0000000..068d6b4 --- /dev/null +++ b/0001-Fix-dmi_cache_size_2-will-add-unit-twice.patch @@ -0,0 +1,26 @@ +From c217e2bd9dfbd23c04dac19759a2d59845fcd6f6 Mon Sep 17 00:00:00 2001 +From: Lichen Liu +Date: Mon, 6 Feb 2023 14:46:47 +0800 +Subject: [PATCH] Fix dmi_cache_size_2 will add unit twice. + +Signed-off-by: Lichen Liu +--- + src/dmidecode.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/src/dmidecode.c b/src/dmidecode.c +index d1a10c1..d40f0ee 100644 +--- a/src/dmidecode.c ++++ b/src/dmidecode.c +@@ -1843,8 +1843,6 @@ void dmi_cache_size_2(xmlNode *node, const char *tagname, u32 code) + size.l = code << 6; + size.h = code >> 26; + } else { +- dmixml_AddAttribute(caches_n, "unit", "KB"); +- dmixml_AddTextContent(caches_n, "%i", code); + size.l = code; + size.h = 0; + } +-- +2.39.1 + diff --git a/python-dmidecode.spec b/python-dmidecode.spec index 2a16376..586b4b5 100644 --- a/python-dmidecode.spec +++ b/python-dmidecode.spec @@ -1,10 +1,11 @@ Name: python-dmidecode Summary: Python module to access DMI data Version: 3.12.3 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 URL: https://github.com/nima/python-dmidecode Source0: https://github.com/nima/python-dmidecode/archive/refs/tags/%{name}-%{version}.tar.gz +Patch0: 0001-Fix-dmi_cache_size_2-will-add-unit-twice.patch BuildRequires: make BuildRequires: gcc @@ -60,6 +61,10 @@ make -C unit-tests %{_datadir}/python-dmidecode/ %changelog +* Tue Feb 07 2023 Lichen Liu - 3.12.3-2 +- Resolves: rhbz#1981868 +- Resolves: rhbz#2166716 + * Wed Nov 23 2022 Lichen Liu - 3.12.3-1 - Update to 3.12.3 - Add smbios3 support.