From 5001a240af9d1ce08f9ce372ae70a6f8f969c210 Mon Sep 17 00:00:00 2001 From: Gris Ge Date: Sat, 13 Jul 2019 07:49:15 +0800 Subject: [PATCH] Fix the conflict with sblim-wbemcli: RHBZ #1724104 Signed-off-by: Gris Ge --- pywbem.spec | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pywbem.spec b/pywbem.spec index f7878ae..8c7b566 100644 --- a/pywbem.spec +++ b/pywbem.spec @@ -2,7 +2,7 @@ Name: pywbem Version: 0.14.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Python WBEM client interface and related utilities License: LGPLv2 URL: https://github.com/pywbem/pywbem @@ -50,6 +50,9 @@ env PYTHONPATH=%{buildroot}/%{python3_sitelib} \ PBR_VERSION="%{version}" \ %{__python3} setup.py install -O1 --skip-build --root %{buildroot} rm -rf %{buildroot}/usr/bin/*.bat +# wbemcli are conflicting with sblim-wbemcli +mv -v %{buildroot}/%{_bindir}/wbemcli %{buildroot}/%{_bindir}/pywbemcli +mv -v %{buildroot}/%{_bindir}/wbemcli.py %{buildroot}/%{_bindir}/pywbemcli.py %files -n python3-pywbem %license LICENSE.txt @@ -57,11 +60,14 @@ rm -rf %{buildroot}/usr/bin/*.bat %{python3_sitelib}/pywbem/ %{python3_sitelib}/pywbem_mock/ %{_bindir}/mof_compiler -%{_bindir}/wbemcli -%{_bindir}/wbemcli.py +%{_bindir}/pywbemcli +%{_bindir}/pywbemcli.py %doc README.rst %changelog +* Sat Jul 13 2019 Gris Ge - 0.14.3-2 +- Fix the conflict with sblim-wbemcli: RHBZ #1724104 + * Sat Jul 13 2019 Gris Ge - 0.14.3-1 - Upgrade to 0.14.3 and removed python2 stuff