python-dmidecode-3.12.2-sw.patch

@@ -1,26 +0,0 @@
-diff -Nuar python-dmidecode-3.12.2.org/src/dmidecode.c python-dmidecode-3.12.2.sw/src/dmidecode.c
---- python-dmidecode-3.12.2.org/src/dmidecode.c	2022-02-26 07:07:27.810000000 +0000
-+++ python-dmidecode-3.12.2.sw/src/dmidecode.c	2022-02-26 07:08:59.290000000 +0000
-@@ -2,10 +2,10 @@
- /*. ******* coding:utf-8 AUTOHEADER START v1.1 *******
-  *. vim: fileencoding=utf-8 syntax=c sw=2 ts=2 et
-  *.
-- *. © 2007-2013 Nima Talebi <nima@autonomy.net.au>
-- *. © 2009-2013 David Sommerseth <davids@redhat.com>
-- *. © 2002-2010 Jean Delvare <khali@linux-fr.org>
-- *. © 2000-2002 Alan Cox <alan@redhat.com>
-+ *. © 2007-2013 Nima Talebi <nima@autonomy.net.au>
-+ *. © 2009-2013 David Sommerseth <davids@redhat.com>
-+ *. © 2002-2010 Jean Delvare <khali@linux-fr.org>
-+ *. © 2000-2002 Alan Cox <alan@redhat.com>
-  *.
-  *. This file is part of Python DMI-Decode.
-  *.
-@@ -831,6 +831,7 @@
-           { 0x2B, "Atom" },
- 
-           { 0x30, "Alpha" },
-+          { 0x9916, "Sw_64" },
-           { 0x31, "Alpha 21064" },
-           { 0x32, "Alpha 21066" },
-           { 0x33, "Alpha 21164" },

python-dmidecode.spec

@@ -1,16 +1,14 @@
 Name:           python-dmidecode
 Version:        3.12.2
-Release:        25
+Release:        19
 Summary:        Python extension module for dmidecode
 
 License:        GPLv2
 URL:            http://projects.autonomy.net.au/python-dmidecode/
 Source0:        https://github.com/nima/python-dmidecode/archive/v%{version}.tar.gz
-%ifarch sw_64
-Patch1:         python-dmidecode-3.12.2-sw.patch
-%endif
 
-BuildRequires:  gcc libxml2-devel python3-libxml2 python3-devel
+BuildRequires:  gcc libxml2-devel python2-libxml2 python3-libxml2
+BuildRequires:  python2-devel python3-devel
 
 %description
 Dmidecode reports information about your system's hardware as described in
@@ -26,6 +24,16 @@ Python-dmidecode is a python extension module that uses the code-base
 of the 'dmidecode' utility and uses libxml2 to display data as python
 data structures or XML data.
 
+%package        -n python2-dmidecode
+Summary:        A python 2 extension module to get DMI data
+Requires:       python2-libxml2
+%{?python_provide:%python_provide python2-dmidecode}
+
+%description    -n python2-dmidecode
+Python2-dmidecode is a python 2 extension module that uses the code-base
+of the 'dmidecode' utility and uses libxml2 to display data as python 2
+data structures or XML data.
+
 %package        -n python3-dmidecode
 Summary:        A python 3 module to access DMI data
 Requires:       python3-libxml2
@@ -38,27 +46,50 @@ data structures or XML data.
 %package_help
 
 %prep
-%autosetup -n %{name}-%{version} -p1
+%autosetup -c -n %{name}-%{version} -p1
+cp -a %{name}-%{version} python2
+cp -a %{name}-%{version} python3
+rm -r %{name}-%{version}
+pushd python3
 sed -i 's/python2/python3/g' Makefile unit-tests/Makefile
+popd
 
 %build
-export PYTHON_BIN=%{__python3}
+export CFLAGS="${CFLAGS-} -std=gnu89"
-export PYTHON_VERSION=%{python3_version}
+pushd python2
-export CFLAGS="%{build_cflags} -std=gnu89"
+make build
-export CC=gcc
+popd
-%make_build
+pushd python3
+make build
+popd
 
 %install
-export CFLAGS="${RPM_OPT_FLAGS}" LDFLAGS="${RPM_LD_FLAGS}"
+pushd python2
+%{__python2} src/setup.py install --root %{buildroot} --prefix=%{_prefix}
+popd
+pushd python3
 %{__python3} src/setup.py install --root %{buildroot} --prefix=%{_prefix}
+popd
 
 %check
-export PYTHONPATH=%{buildroot}%{python3_sitearch}
+pushd python2/unit-tests
-export PYTHON_BIN=%{__python3}
+make
-make -C unit-tests
+popd
+pushd python3/unit-tests
+make
+popd
+
+%files -n python2-dmidecode
+%license python2/doc/LICENSE python2/doc/AUTHORS python2/doc/AUTHORS.upstream
+%{python2_sitearch}/dmidecode.py
+%{python2_sitearch}/dmidecode.pyc
+%{python2_sitearch}/dmidecode.pyo
+%{python2_sitearch}/dmidecodemod.so
+%{python2_sitearch}/python_dmidecode-3.12.2-py2.7.egg-info
+%{_datadir}/python-dmidecode/pymap.xml
 
 %files -n python3-dmidecode
-%license doc/LICENSE doc/AUTHORS doc/AUTHORS.upstream
+%license python3/doc/LICENSE python3/doc/AUTHORS python3/doc/AUTHORS.upstream
 %{python3_sitearch}/__pycache__/*.pyc
 %{python3_sitearch}/dmidecode.py
 %{python3_sitearch}/dmidecodemod.cpython-3*.so
@@ -66,37 +97,17 @@ make -C unit-tests
 %{_datadir}/python-dmidecode/pymap.xml
 
 %files help
-%doc README doc/README.upstream
+%doc python2/README python2/doc/README.upstream
+%doc python3/README python3/doc/README.upstream
 
 %changelog
-* Wed Mar 01 2023 zhouwenpei<zhouwenpei@h-partners.com>- 3.12.2-25
-- strip binary file
-
-* Wed Nov 23 2022 wuzx<wuzx1226@qq.com> - 3.12.2-24
-- Add sw64 architecture
-
-* Mon Jun 6 2022 yangcheng <yangcheng87@h-partners.com> - 3.12.2-23
-- Type:bugfix
-- CVE:NA
-- SUG:NA
-- DESC:strip binary file
-
-* Thu Apr 14 2022 dongyuzhen <dongyuzhen@h-partners.com> - 3.12.2-22
-- fix test case failed
-
-* Sat Mar 20 2021 Dehui Fan<fandehui1@huawei.com> - 3.12.2-21
-- strip binary files
-
-* Fri Oct 30 2020 chengguipeng <chengguipeng1@huawei.com> - 3.12.2-20
-- remove python2-dmidecode subpackage
-
 * Wed Sep 9 2020 hanhui <hanhui15@huawei.com> - 3.12.2-19
 - Type:bugfix
 - ID:NA
 - SUG:NA
 - DESC:modify source url
 
-* Tue Jun 16 2020 hanhui <hanhui15@huawei.com> - 3.12.2-18
+* Thu Jun 16 2020 hanhui <hanhui15@huawei.com> - 3.12.2-18
 - Type:bugfix
 - Id:NA
 - SUG:NA