From 4bbfa0d8a1d065f6b9e7c1aecd8b215e22c0fdab185d1a9d7adf9f46f8fb22ad Mon Sep 17 00:00:00 2001
From: Matej Cepl <mcepl@suse.com>
Date: Tue, 14 Mar 2023 10:32:38 +0000
Subject: [PATCH] - In the end just a cosmetical changes and cleaning up the
 SPEC   file.

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-dmidecode?expand=0&rev=26
---
 python-dmidecode.changes   |  6 ++++++
 python-dmidecode.rpmlintrc |  1 +
 python-dmidecode.spec      | 30 ++++++++++++++++--------------
 3 files changed, 23 insertions(+), 14 deletions(-)
 create mode 100644 python-dmidecode.rpmlintrc

diff --git a/python-dmidecode.changes b/python-dmidecode.changes
index eb55167..c6e5816 100644
--- a/python-dmidecode.changes
+++ b/python-dmidecode.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Mar 14 10:32:01 UTC 2023 - Matej Cepl <mcepl@suse.com>
+
+- In the end just a cosmetical changes and cleaning up the SPEC
+  file.
+
 -------------------------------------------------------------------
 Sat Nov 19 20:37:12 UTC 2022 - Matej Cepl <mcepl@suse.com>
 
diff --git a/python-dmidecode.rpmlintrc b/python-dmidecode.rpmlintrc
new file mode 100644
index 0000000..0ee1c94
--- /dev/null
+++ b/python-dmidecode.rpmlintrc
@@ -0,0 +1 @@
+addFilter("obsolete-not-provided")
diff --git a/python-dmidecode.spec b/python-dmidecode.spec
index 3757343..da57563 100644
--- a/python-dmidecode.spec
+++ b/python-dmidecode.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-dmidecode
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,8 +16,8 @@
 #
 
 
-%{?!python_module:%define python_module() python-%{**} python3-%{**}}
 %define oldpython python
+%define modname dmidecode
 Name:           python-dmidecode
 Version:        3.12.3
 Release:        0
@@ -26,7 +26,7 @@ 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
+Source99:       python-dmidecode.rpmlintrc
 # PATCH-FIX-UPSTREAM gcc7-inline.patch gh#nima/python-dmidecode#35 mcepl@suse.com
 # Don't use inline keyword.
 Patch1:         gcc7-inline.patch
@@ -36,21 +36,21 @@ Patch2:         31-version_info-v-version.patch
 # PATCH-FIX-UPSTREAM detect-lib-with-py3.patch gh#nima/python-dmidecode#36 mcepl@suse.com
 #  Make the code future-proof against removal of distutils module.
 Patch3:         detect-lib-with-py3.patch
-Obsoletes:      %{oldpython}-dmidecode <= %{version}
-Obsoletes:      python-python-dmidecode <= %{version}
 BuildRequires:  %{python_module devel}
-%if 0%{?sle_version} >= 150400 || 0%{?suse_version} >= 1550
-BuildRequires:  %{python_module libxml2}
-%else
-BuildRequires:  python2-libxml2-python
-BuildRequires:  python3-libxml2-python
-%endif
 BuildRequires:  fdupes
 BuildRequires:  libxml2-devel
 BuildRequires:  python-rpm-macros
 Requires:       python
 Requires(post): update-alternatives
 Requires(postun):update-alternatives
+Obsoletes:      %{oldpython}-dmidecode <= %{version}
+Obsoletes:      python-python-dmidecode <= %{version}
+%if 0%{?sle_version} >= 150400 || 0%{?suse_version} >= 1550
+BuildRequires:  %{python_module libxml2}
+%else
+BuildRequires:  python2-libxml2-python
+BuildRequires:  python3-libxml2-python
+%endif
 %python_subpackages
 
 %description
@@ -62,6 +62,7 @@ structures or as XML data using libxml2.
 %autosetup -p1
 
 %build
+export CFLAGS="%{optflags}"
 %{python_expand export LDFLAGS="-Wl,-rpath=%{$python_sitearch}"
 %make_build PY_BIN=$python build
 }
@@ -82,7 +83,7 @@ ln -s %{_sysconfdir}/alternatives/pymap.xml \
 %check
 pushd unit-tests
 %{python_expand export PYTHONPATH=%{buildroot}%{$python_sitearch}
-make PY_BIN=$python
+%make_build PY_BIN=$python
 }
 popd
 
@@ -107,7 +108,8 @@ fi
 %{_datadir}/python-dmidecode/pymap-%{python_bin_suffix}.xml
 # %%{python_sitearch}/python_dmidecode-%%{version}*-info
 %{python_sitearch}/python_dmidecode-3.12.2*-info
-%{python_sitearch}/dmidecode*
-%pycache_only %{python_sitearch}/__pycache__/dmidecode*.py[co]
+%{python_sitearch}/dmidecode.py
+%{python_sitearch}/dmidecodemod.*.so
+%pycache_only %{python_sitearch}/__pycache__/dmidecode*.pyc
 
 %changelog