5 changed files with 64 additions and 89 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,3 +1,4 @@
 python-dmidecode-3.10.13.tar.gz
 python-dmidecode-3.10.13.tar.xz
 /python-dmidecode-3.12.2.tar.gz
+/python-dmidecode-3.12.3.tar.gz
--- a/.python-dmidecode.metadata
+++ b/.python-dmidecode.metadata
@ -0,0 +1 @@
+f06f73840beba1575ff0109c23a9de0e7b8ab21f python-dmidecode-3.12.3.tar.gz
--- a/0002-Fix-wrong-DMI-structures-count.patch
+++ b/0002-Fix-wrong-DMI-structures-count.patch
@ -1,59 +0,0 @@
-From 5643ecc7530489bf0875c4fe96031671b3cda435 Mon Sep 17 00:00:00 2001
-From: Lichen Liu <lichliu@redhat.com>
-Date: Fri, 17 Feb 2023 11:09:05 +0800
-Subject: [PATCH] Fix wrong DMI structures count
-
-SMBIOS v3 64-bit entry points do not announce a structures count,
-and only indicate a maximum size for the table.
-
-Remove debug log.
-
-Signed-off-by: Lichen Liu <lichliu@redhat.com>
---
- src/dmidecode.c | 10 +++++++---
- src/efi.c       |  4 ----
- 2 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/src/dmidecode.c b/src/dmidecode.c
-index d1a10c1..a013c53 100644
--- a/src/dmidecode.c
-+++ b/src/dmidecode.c
-@@ -6241,13 +6241,17 @@ static void dmi_table(Log_t *logp, int type, u32 base, u32 len, u16 num, u32 ver
-                 dmixml_AddAttribute(handle_n, "type", "%i", type);
-                 dmixml_AddAttribute(handle_n, "notfound", "1");
-         }
-
-        if(i != num) {
-+	/*
-+	 * SMBIOS v3 64-bit entry points do not announce a structures count,
-+	 * and only indicate a maximum size for the table.
-+	 */
-+        if(num && i != num) {
-                 log_append(logp, LOGFL_NODUPS, LOG_WARNING,
-                            "Wrong DMI structures count: %d announced, only %d decoded.", num, i);
-         }
- 
-        if(data - buf != len) {
-+        if((unsigned long)(data - buf) > len
-+		 || (num && (unsigned long)(data - buf) < len)) {
-                 log_append(logp, LOGFL_NODUPS, LOG_WARNING,
-                         "Wrong DMI structures length: %d bytes announced, structures occupy %d bytes.",
-                         len, (unsigned int)(data - buf));
-diff --git a/src/efi.c b/src/efi.c
-index e519257..362e2f9 100644
--- a/src/efi.c
-+++ b/src/efi.c
-@@ -83,10 +83,6 @@ int address_from_efi(Log_t *logp, size_t * address)
-                 log_append(logp, LOGFL_NODUPS, LOG_WARNING, "%s: SMBIOS entry point missing", filename);
-         }
- 
-        if(ret == 0){
-                log_append(logp, LOGFL_NODUPS, LOG_DEBUG, "%s: entry point at 0x%08llx", eptype, (unsigned long long)*address);
-        }
-
-         return ret;
- }
- 
-- 
-2.39.1
-
--- a/gating.yaml
+++ b/gating.yaml
@ -1,6 +1,6 @@
 --- !Policy
 product_versions:
-  - rhel-8
+  - rhel-9
 decision_context: osci_compose_gate
 rules:
  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
--- a/python-dmidecode.spec
+++ b/python-dmidecode.spec
@ -3,18 +3,16 @@ Summary: Python module to access DMI data
 Version: 3.12.3
 Release: 2%{?dist}
 License: GPLv2
-Group: System Environment/Libraries
 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
-Patch1: 0002-Fix-wrong-DMI-structures-count.patch

 BuildRequires: make
 BuildRequires: gcc
 BuildRequires: libxml2-devel

 BuildRequires: python3-devel
-BuildRequires: python3-libxml2
+BuildRequires: libxml2-python3

 %global _description\
 python-dmidecode is a python extension module that uses the\
@ -28,13 +26,8 @@ as python data structures or as XML data using libxml2.\
 %package -n python3-dmidecode
 Summary: Python 3 module to access DMI data
 Requires: libxml2-python3
-ExclusiveArch:  x86_64
-
-%description -n python3-dmidecode
-python3-dmidecode is a Python 3 extension module that uses the
-code-base of the 'dmidecode' utility, and presents the data
-as Python 3 data structures or as XML data using libxml2.

+%description -n python3-dmidecode %_description


 %prep
@ -59,37 +52,76 @@ make -C unit-tests


 %files -n python3-dmidecode
-%license doc/LICENSE doc/AUTHORS doc/AUTHORS.upstream
-%doc README doc/README.upstream
-%{python3_sitearch}/dmidecodemod.cpython-%{python3_version_nodots}m-*.so
+%license doc/LICENSE
+%doc README doc/AUTHORS doc/AUTHORS.upstream
+%{python3_sitearch}/dmidecodemod.cpython-%{python3_version_nodots}*.so
 %{python3_sitearch}/__pycache__/dmidecode.cpython-%{python3_version_nodots}*.py[co]
 %{python3_sitearch}/dmidecode.py
 %{python3_sitearch}/*.egg-info
 %{_datadir}/python-dmidecode/

 %changelog
-* Fri Feb 17 2023 Lichen Liu <lichliu@redhat.com> - 3.12.3-2
- Resolves: rhbz#2103911
+* Tue Feb 07 2023 Lichen Liu <lichliu@redhat.com> - 3.12.3-2
+- Resolves: rhbz#1981868
+- Resolves: rhbz#2166716

-* Tue Feb 07 2023 Lichen Liu <lichliu@redhat.com> - 3.12.3-1
- Resolves: rhbz#2070727
- Resolves: rhbz#2103911
+* Wed Nov 23 2022 Lichen Liu <lichliu@redhat.com> - 3.12.3-1
+- Update to 3.12.3
+- Add smbios3 support.

-* Wed May 08 2019 Lianbo Jiang <lijiang@redhat.com> - 3.12.2-15
- Fix an index out of range when calling dmidecode.memory().
- Resolves: #1665443
+* Sat Aug 14 2021 Coiby Xu <coxu@redhat.com> - 3.12.2-27
+- Resolves: rhbz#1938852
+- Resolves: rhbz#1992494
+  Related: rhbz#1991688

-* Mon Apr 15 2019 Lianbo Jiang <lijiang@redhat.com> - 3.12.2-14
- Add the gating test
- Resolves: #1680625
+* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 3.12.2-26
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688

-* Fri Sep 14 2018 Lianbo Jiang <lijiang@redhat.com> - 3.12.2-13
- Disable build python-dmidecode package other than x86_64 architecture
- Resolves: #1626424
+* Mon Jul 19 2021 Coiby Xu <coxu@redhat.com> - 3.12.2-25
+- Fix several issues found by covscan
+- Resolves: rhbz#1938852

-* Mon Jun 04 2018 Petr Viktorin <pviktori@redhat.com> - 3.12.2-12
- Drop the Python2 subpackage
-  https://bugzilla.redhat.com/show_bug.cgi?id=1567417
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 3.12.2-24
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.12.2-23
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Thu Nov 26 2020 Antonio Trande <sagitter@fedoraproject.org> - 3.12.2-22
+- Refresh SPEC file
+- Fixed for Python-3.10 (rhbz#1898981)
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.12.2-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 3.12.2-20
+- Rebuilt for Python 3.9
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.12.2-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 3.12.2-18
+- Rebuilt for Python 3.8.0rc1 (#1748018)
+
+* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 3.12.2-17
+- Rebuilt for Python 3.8
+
+* Sun Aug 11 2019 Miro Hrončok <mhroncok@redhat.com> - 3.12.2-16
+- Subpackage python2-dmidecode has been removed
+  See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.12.2-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.12.2-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.12.2-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 3.12.2-12
+- Rebuilt for Python 3.7

 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.12.2-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
				`@ -0,0 +1 @@`
				`f06f73840beba1575ff0109c23a9de0e7b8ab21f python-dmidecode-3.12.3.tar.gz`