diff --git a/.gitignore b/.gitignore index 57a4efc..054abe4 100644 --- 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-f0a089a12dca9e2fd9543c8e8086ac70f7058513.tar.gz diff --git a/python-dmidecode-use_python3.patch b/python-dmidecode-use_python3.patch index 65bca47..0cda00d 100644 --- a/python-dmidecode-use_python3.patch +++ b/python-dmidecode-use_python3.patch @@ -4,7 +4,7 @@ #. $AutoHeaderSerial::20100225 $ #. ******* AUTOHEADER END v1.2 ******* --PY_BIN := python2 +-PY_BIN := python3 -VERSION := $(shell cd src;$(PY_BIN) -c "from setup_common import *; print(get_version());") +PY_BIN := $(PYTHON_BIN) +VERSION := $(PYTHON_VERSION) @@ -23,7 +23,7 @@ --- a/unit-tests/Makefile.orig 2015-06-08 17:19:45.000000000 +0200 +++ b/unit-tests/Makefile 2020-11-26 17:12:15.222361106 +0100 @@ -1,5 +1,5 @@ --PY_BIN := python2 +-PY_BIN := python3 +PY_BIN := $(PYTHON_BIN) test : diff --git a/python-dmidecode.spec b/python-dmidecode.spec index dabf8c8..9fbe87e 100644 --- a/python-dmidecode.spec +++ b/python-dmidecode.spec @@ -1,10 +1,14 @@ +%global commit f0a089a12dca9e2fd9543c8e8086ac70f7058513 +%global date .20210630git +%global shortcommit %(c=%{commit}; echo ${c:0:8}) + Name: python-dmidecode Summary: Python module to access DMI data Version: 3.12.2 -Release: 26%{?dist} +Release: 27%{date}%{shortcommit}%{?dist} License: GPLv2 URL: https://github.com/nima/python-dmidecode -Source0: https://github.com/nima/python-dmidecode/archive/v%{version}/%{name}/%{name}-%{version}.tar.gz +Source0: %{url}/archive/%{commit}/%{name}-%{commit}.tar.gz Patch0: python-dmidecode-use_python3.patch @@ -32,7 +36,8 @@ Requires: libxml2-python3 %prep -%autosetup -p1 +%autosetup -n %{name}-%{commit} -N +%patch0 -p1 -b .backup %build # -std=gnu89 is there to avoid `undefined symbol: dmixml_GetContent` @@ -62,6 +67,9 @@ make -C unit-tests %{_datadir}/python-dmidecode/ %changelog +* Sun Apr 24 2022 Antonio Trande - 3.12.2-27.20210630gitf0a089a1 +- Build commit #f0a089a1 (include covscan error fixes) + * Fri Jan 21 2022 Fedora Release Engineering - 3.12.2-26 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index 7e07fdf..8830b3c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (python-dmidecode-3.12.2.tar.gz) = da5c4d52d74b77c3aa6fc7b63b9fd29150a6e915286efbcfc4284caa0bacf8a1bc077614c83ee93f14e7d9502713a37f135885a075b96b1bf73bd0704e5a258f +SHA512 (python-dmidecode-f0a089a12dca9e2fd9543c8e8086ac70f7058513.tar.gz) = 63cf1e51d5864c2490d677cf9808608434a58e0ca401727bf82ad2609a29ef66b19768735ecabaf007b2837ccf6c78f4268d2d7c3aab93f1dac0f35cc7a44492