diff --git a/huge-memory.patch b/huge-memory.patch deleted file mode 100644 index 3434d2d..0000000 --- a/huge-memory.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- - src/dmidecode.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/src/dmidecode.c -+++ b/src/dmidecode.c -@@ -5378,7 +5378,7 @@ xmlNode *dmi_decode(xmlNode *prnt_n, dmi - dmi_memory_device_width(sect_n, "TotalWidth", WORD(data + 0x08)); - dmi_memory_device_width(sect_n, "DataWidth", WORD(data + 0x0A)); - if (h->length >= 0x20 && WORD(data + 0x0C) == 0x7FFF) { -- dmi_memory_device_extended_size(sect_n, WORD(data + 0x1C)); -+ dmi_memory_device_extended_size(sect_n, DWORD(data + 0x1C)); - } else { - dmi_memory_device_size(sect_n, WORD(data + 0x0C)); - } diff --git a/python-dmidecode-3.12.2+git.1666757106.e6ab5bc.tar.gz b/python-dmidecode-3.12.2+git.1666757106.e6ab5bc.tar.gz deleted file mode 100644 index 5bc8dd5..0000000 --- a/python-dmidecode-3.12.2+git.1666757106.e6ab5bc.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a9d9329d5ad3cce54bdd1db1af5877677416557b5ff19f4ac8265d65ed5d5e35 -size 160487 diff --git a/python-dmidecode-3.12.3.tar.gz b/python-dmidecode-3.12.3.tar.gz new file mode 100644 index 0000000..33a2136 --- /dev/null +++ b/python-dmidecode-3.12.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:44d45d7d8344290c259c989d3af3f614c7837cbd85052d486adfa46a1c777164 +size 156670 diff --git a/python-dmidecode.changes b/python-dmidecode.changes index 4607dc2..eb55167 100644 --- a/python-dmidecode.changes +++ b/python-dmidecode.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sat Nov 19 20:37:12 UTC 2022 - Matej Cepl + +- Update to the upstream release 3.12.3: + - consolidation of previous git commits + - support SMBIOS3.3.0 +- Remove upstreamed huge-memory.patch + ------------------------------------------------------------------- Wed Oct 26 15:51:25 UTC 2022 - Matej Cepl diff --git a/python-dmidecode.spec b/python-dmidecode.spec index 972b234..3757343 100644 --- a/python-dmidecode.spec +++ b/python-dmidecode.spec @@ -19,17 +19,14 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %define oldpython python Name: python-dmidecode -Version: 3.12.2+git.1666757106.e6ab5bc +Version: 3.12.3 Release: 0 Summary: Python module to access DMI data License: GPL-2.0-only Group: System/Libraries URL: https://github.com/nima/python-dmidecode -# Source0: https://github.com/nima/python-dmidecode/archive/refs/tags/v%%{version}.tar.gz#/python-dmidecode-%%{version}.tar.gz -Source0: python-dmidecode-%{version}.tar.gz -# PATCH-FIX-UPSTREAM huge-memory.patch gh#nima/python-dmidecode#33 mcepl@suse.com -# use DWORD instead of WORD when calling dmi_memory_device_extended_size -Patch0: huge-memory.patch +Source0: https://github.com/nima/python-dmidecode/archive/refs/tags/v%{version}.tar.gz#/python-dmidecode-%{version}.tar.gz +# Source0: python-dmidecode-%{version}.tar.gz # PATCH-FIX-UPSTREAM gcc7-inline.patch gh#nima/python-dmidecode#35 mcepl@suse.com # Don't use inline keyword. Patch1: gcc7-inline.patch