From b409203bc4d5877e84645fdd96afba74dff305f8 Mon Sep 17 00:00:00 2001
From: Shuo Wang <abushwang@tencent.com>
Date: Tue, 11 Jul 2023 14:52:36 +0800
Subject: [PATCH] update to 1.5.34

Signed-off-by: Shuo Wang <abushwang@tencent.com>
---
 nopbr.patch        | 12 ++++++++++++
 python-pyghmi.spec | 16 +++++++++++++---
 setup.patch        | 22 ++++++++++++++++++++++
 sources            |  2 +-
 4 files changed, 48 insertions(+), 4 deletions(-)
 create mode 100644 nopbr.patch
 create mode 100644 setup.patch

diff --git a/nopbr.patch b/nopbr.patch
new file mode 100644
index 0000000..ae951ce
--- /dev/null
+++ b/nopbr.patch
@@ -0,0 +1,12 @@
+diff -up pyghmi-1.5.14/pyghmi/version.py~ pyghmi-1.5.14/pyghmi/version.py
+--- pyghmi-1.5.14/pyghmi/version.py~	2020-04-22 22:23:43.000000000 +0200
++++ pyghmi-1.5.14/pyghmi/version.py	2021-08-06 10:59:41.595820434 +0200
+@@ -13,6 +13,6 @@
+ #    License for the specific language governing permissions and limitations
+ #    under the License.
+ 
+-import pbr.version
++#import pbr.version
+ 
+-version_info = pbr.version.VersionInfo('pyghmi')
++version_info = "@@REDHATVERSION@@"
diff --git a/python-pyghmi.spec b/python-pyghmi.spec
index 43f1834..53c1e7f 100644
--- a/python-pyghmi.spec
+++ b/python-pyghmi.spec
@@ -2,12 +2,16 @@
 
 Summary: Python General Hardware Management Initiative (IPMI and others)
 Name:    python-%{sname}
-Version: 1.5.29
-Release: 3%{?dist}
+Version: 1.5.34
+Release: 1%{?dist}
 License: ASL 2.0
 Url: https://opendev.org/x/pyghmi
 Source0: https://tarballs.opendev.org/x/%{sname}/%{sname}-%{version}.tar.gz
 
+# we remove require to python3-pbr by these two patch
+Patch3000:  nopbr.patch
+Patch3001:  setup.patch
+
 BuildArch: noarch
 
 %description
@@ -19,7 +23,7 @@ library into a Python application.
 %package -n python3-%{sname}
 Summary: Python General Hardware Management Initiative (IPMI and others)
 
-BuildRequires: python3-devel python3-pbr python3-setuptools
+BuildRequires: python3-devel python3-setuptools
 Requires: python3-cryptography python3-six python3-dateutil
 
 %description -n python3-%{sname}
@@ -42,7 +46,10 @@ Tests for the pyghmi library
 
 %prep
 %autosetup -n %{sname}-%{version} -p1
+
 sed -i 's/python-dateutil.*/python-dateutil>=2.6.1/' requirements.txt
+sed -i s/@@REDHATVERSION@@/%{version}/ pyghmi/version.py
+sed -e "s/#VERSION#/%{version}/" setup.py.tmpl > setup.py
 
 %build
 %py3_build
@@ -77,6 +84,9 @@ popd
 %{python3_sitelib}/%{sname}/tests
 
 %changelog
+* Tue Jul 11 2023 Shuo Wang <abushwang@tencent.com> - 1.5.34-1
+- update to 1.5.34
+
 * Fri Apr 28 2023 OpenCloudOS Release Engineering <releng@opencloudos.tech> - 1.5.29-3
 - Rebuilt for OpenCloudOS Stream 23.05
 
diff --git a/setup.patch b/setup.patch
new file mode 100644
index 0000000..04a4994
--- /dev/null
+++ b/setup.patch
@@ -0,0 +1,22 @@
+diff -up pyghmi-1.5.14/.orig.orig pyghmi-1.5.14/.orig
+diff -up pyghmi-1.5.14/setup.py.tmpl.orig pyghmi-1.5.14/setup.py.tmpl
+--- pyghmi-1.5.14/setup.py.tmpl.orig	2021-08-06 11:44:02.618240604 +0200
++++ pyghmi-1.5.14/setup.py.tmpl	2021-08-06 11:44:35.586675599 +0200
+@@ -26,6 +26,16 @@ setuptools.setup(
+     packages=['pyghmi', 'pyghmi.util', 'pyghmi.ipmi', 'pyghmi.cmd',
+               'pyghmi.redfish', 'pyghmi.ipmi.private', 'pyghmi.ipmi.oem',
+               'pyghmi.ipmi.oem.lenovo', 'pyghmi.redfish.oem',
+-              'pyghmi.redfish.oem.dell', 'pyghmi.redfish.oem.lenovo'],
++              'pyghmi.redfish.oem.dell', 'pyghmi.redfish.oem.lenovo',
++              'pyghmi.tests'],
++    entry_points={
++        'console_scripts': [
++            'pyghmicons=pyghmi.cmd.pyghmicons:main',
++            'pyghmiutil=pyghmi.cmd.pyghmiutil:main',
++            'virshbmc=pyghmi.cmd.virshbmc:main',
++            'fakebmc=pyghmi.cmd.fakebmc:main',
++        ],
++    },
++
+     license='Apache License, Version 2.0')
+ 
diff --git a/sources b/sources
index 568c921..8c7982f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pyghmi-1.5.29.tar.gz) = 3e3ecbf4efa179b872d8cc24774e81f6946fa122bb5f3b5de3598e17b448eb5010d6bf6f783b7c27422b71e4739e8b34127ff1c3b5dfec341382f49b2b691c29
+SHA512 (pyghmi-1.5.34.tar.gz) = fc61d5f8814366e51964b30e29f632d774ec8f202e4c05bd973fbe74e11f560a706e4abd6e01e4ae52d72dff2608c6abe72b5c46941884e472f159d2e4063047
-- 
Gitee