Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-dmidecode for
openSUSE:Factory checked in at 2022-03-07 17:45:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-dmidecode (Old)
and /work/SRC/openSUSE:Factory/.python-dmidecode.new.1958 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-dmidecode"
Mon Mar 7 17:45:59 2022 rev:3 rq:959991 version:3.12.2+git.1625035095.f0a089a
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-dmidecode/python-dmidecode.changes
2022-02-25 21:25:32.675643370 +0100
+++
/work/SRC/openSUSE:Factory/.python-dmidecode.new.1958/python-dmidecode.changes
2022-03-07 17:46:03.451135153 +0100
@@ -1,0 +2,16 @@
+Mon Mar 7 13:44:33 UTC 2022 - Matej Cepl <[email protected]>
+
+- Add missing Obsoletes
+
+-------------------------------------------------------------------
+Fri Mar 4 09:24:04 UTC 2022 - Matej Cepl <[email protected]>
+
+- Harmonize Factory with the SLE version (update-alternatives
+ instead of the subpackages).
+
+-------------------------------------------------------------------
+Mon Feb 28 10:41:11 UTC 2022 - Matej Cepl <[email protected]>
+
+- Add proper Provides/Obsoletes
+
+-------------------------------------------------------------------
@@ -6,0 +23,6 @@
+Thu Feb 24 21:15:44 UTC 2022 - Matej Cepl <[email protected]>
+
+- Introduce update-alternatives for
+ /usr/share/python-dmidecode/pymap.xml.
+
+-------------------------------------------------------------------
@@ -23,0 +46 @@
+ * Fixed memory Type Detail map size (bsc#1194351).
@@ -29,2 +52 @@
- Python one. In the end we need one shared package and multiple
- python-versioned ones.
+ Python one.
@@ -31,0 +54,6 @@
+- Rename huge-memory.diff to huge-memory.patch (i.e., remove
+ huge-memory.diff and add huge-memory.patch).
+- Fix URL of Source0 (their own website is down, use GitHub
+ release).
+- Add 31-version_info-v-version.patch to make tests 3.10
+ compatible.
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-dmidecode.spec ++++++
--- /var/tmp/diff_new_pack.urAj84/_old 2022-03-07 17:46:04.767134773 +0100
+++ /var/tmp/diff_new_pack.urAj84/_new 2022-03-07 17:46:04.775134770 +0100
@@ -1,5 +1,5 @@
#
-# spec file
+# spec file for package python-dmidecode
#
# Copyright (c) 2022 SUSE LLC
#
@@ -17,10 +17,8 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
-%define python_subpackage_only 1
%define oldpython python
-
-Name: %{oldpython}-dmidecode
+Name: python-dmidecode
Version: 3.12.2+git.1625035095.f0a089a
Release: 0
Summary: Python module to access DMI data
@@ -35,16 +33,20 @@
# PATCH-FIX-UPSTREAM 31-version_info-v-version.patch
gh#nima/python-dmidecode#31 [email protected]
# use sys.version_info instead of sys.version
Patch3: 31-version_info-v-version.patch
+Obsoletes: %{oldpython}-dmidecode <= 3.12.2+git.1625035095.f0a089a
+Obsoletes: python-python-dmidecode <= 3.12.2+git.1625035095.f0a089a
BuildRequires: %{python_module devel}
%if 0%{?sle_version} && 0%{?sle_version} < 150400
-BuildRequires: %{oldpython}-libxml2-python
-BuildRequires: %{oldpython}3-libxml2-python
+BuildRequires: python2-libxml2-python
+BuildRequires: python3-libxml2-python
%else
BuildRequires: %{python_module libxml2}
%endif
BuildRequires: fdupes
BuildRequires: libxml2-devel
BuildRequires: python-rpm-macros
+Requires(post): update-alternatives
+Requires(postun):update-alternatives
%python_subpackages
%description
@@ -52,15 +54,6 @@
of the 'dmidecode' utility, and presents the data as python data
structures or as XML data using libxml2.
-%package -n python-python-dmidecode
-Summary: Python module to access DMI data
-Requires: %{oldpython}-dmidecode = %{version}-%{release}
-
-%description -n python-python-dmidecode
-A Python extension module that uses the code-base of the
-'dmidecode' utility, and presents the data as Python data
-structures or as XML data using libxml2.
-
%prep
%autosetup -p1
@@ -72,26 +65,40 @@
}
%install
-%{python_expand $python src/setup.py install --root %{buildroot}
--prefix=%{_prefix}
+%{python_expand rm -f %{buildroot}%{_datadir}/python-dmidecode/pymap.xml
+$python src/setup.py install --root %{buildroot} --prefix=%{_prefix}
+ls -l %{buildroot}%{_datadir}/python-dmidecode/
+mv %{buildroot}%{_datadir}/python-dmidecode/pymap{,-%{$python_bin_suffix}}.xml
+touch %{buildroot}%{_datadir}/python-dmidecode/pymap.xml
%fdupes %{buildroot}%{$python_sitearch}
}
%check
pushd unit-tests
-%{python_expand export PYTHON=$python
-%make_build
-}
+%python_expand PYTHON=$python %make_build
popd
+%post
+PRIO=$(echo %{python_version}|tr -d '.')
+/usr/sbin/update-alternatives --install %{_datadir}/python-dmidecode/pymap.xml
pymap.xml \
+ %{_datadir}/python-dmidecode/pymap-%{python_bin_suffix}.xml ${PRIO}
+
+%postun
+if [ ! -f %{_datadir}/python-dmidecode/pymap-%{python_bin_suffix}.xml ] ; then
+ MAJVER=$(ver=%{python_version}; echo ${ver:0:1})
+ /usr/sbin/update-alternatives --remove pymap.xml \
+ %{_datadir}/python-dmidecode/pymap-%{python_bin_suffix}.xml
+fi
+
%clean
-%files
+%files %{python_files}
%license doc/LICENSE
%doc README doc/README.upstream doc/AUTHORS doc/AUTHORS.upstream
%dir %{_datadir}/python-dmidecode/
-%{_datadir}/python-dmidecode/
-
-%files %{python_files python-dmidecode}
+%ghost %{_sysconfdir}/alternatives/pymap.xml
+%ghost %{_datadir}/python-dmidecode/pymap.xml
+%{_datadir}/python-dmidecode/pymap-%{python_bin_suffix}.xml
%{python_sitearch}/dmidecode*
%{python_sitearch}/*.egg-info
%pycache_only %{python_sitearch}/__pycache__/*
++++++ detect-lib-with-py3.patch ++++++
--- /var/tmp/diff_new_pack.urAj84/_old 2022-03-07 17:46:04.827134756 +0100
+++ /var/tmp/diff_new_pack.urAj84/_new 2022-03-07 17:46:04.831134754 +0100
@@ -1,5 +1,5 @@
---
- python-dmidecode-3.12.2/src/setup_common.py | 7 +++++--
+ src/setup_common.py | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
--- a/src/setup_common.py
