diff --git a/.python-pyghmi.metadata b/.python-pyghmi.metadata index 49b344c..af07e57 100644 --- a/.python-pyghmi.metadata +++ b/.python-pyghmi.metadata @@ -1 +1 @@ -0b3b4b4ebd0adce8cd4a2aac0a1a2c428dd073fc SOURCES/pyghmi-1.5.29.tar.gz +b02a7a9c8a378cfca7ee8f8a674e648dc38be824 SOURCES/pyghmi-1.5.19.tar.gz diff --git a/SPECS/python-pyghmi.spec b/SPECS/python-pyghmi.spec index 44d89e2..d05e504 100644 --- a/SPECS/python-pyghmi.spec +++ b/SPECS/python-pyghmi.spec @@ -1,4 +1,3 @@ -%{?python_enable_dependency_generator} %global sname pyghmi %global common_summary Python General Hardware Management Initiative (IPMI and others) @@ -18,25 +17,16 @@ incorporate the pyghmi library into a Python application. %global with_python2 1 %endif -%if %{lua: if (string.find(rpm.expand("%{?dist}"), "ost") == nil) then print(0) else print(1) end} -%bcond_without docs -%else -%bcond_with docs -%endif - Summary: %{common_summary} Name: python-%{sname} -Version: %{?version:%{version}}%{!?version:1.5.29} -Release: 1%{?dist} +Version: %{?version:%{version}}%{!?version:1.5.19} +Release: 2%{?dist} Source0: https://tarballs.opendev.org/x/%{sname}/%{sname}-%{version}.tar.gz License: ASL 2.0 Prefix: %{_prefix} BuildArch: noarch Url: https://git.openstack.org/cgit/openstack/pyghmi -Patch0: nopbr.patch -Patch1: setup.patch - %description %{common_desc} @@ -45,9 +35,8 @@ Patch1: setup.patch Summary: %{common_summary} %{?python_provide:%python_provide python2-%{sname}} -BuildRequires: openstack-macros BuildRequires: python2-devel -#BuildRequires: python2-pbr +BuildRequires: python2-pbr BuildRequires: python2-setuptools Requires: python2-cryptography >= 2.1 @@ -73,7 +62,7 @@ Summary: %{common_summary} %{?python_provide:%python_provide python3-%{sname}} BuildRequires: python3-devel -#BuildRequires: python3-pbr +BuildRequires: python3-pbr BuildRequires: python3-setuptools Requires: python3-cryptography >= 2.1 @@ -92,13 +81,11 @@ Requires: python3-%{sname} = %{version}-%{release} %endif # with_python3 -%if %{with docs} - %package -n python-%{sname}-doc Summary: The pyghmi library documentation %if 0%{?with_python2} -BuildRequires: python-sphinx +BuildRequires: python2-sphinx BuildRequires: python2-openstackdocstheme %else BuildRequires: python3-sphinx @@ -108,36 +95,23 @@ BuildRequires: python3-openstackdocstheme %description -n python-%{sname}-doc Documentation for the pyghmi library -%endif - %prep %setup -qn %{sname}-%{version} -%patch0 -p1 -%patch1 -p1 - # NOTE(dtantsur): pyghmi is actual fine with older dateutil, 2.8.1 is missing # from both Fedora and CentOS currently. See # https://bugzilla.redhat.com/show_bug.cgi?id=1835084 sed -i 's/python-dateutil.*/python-dateutil>=2.6.1/' requirements.txt -sed -i s/@@REDHATVERSION@@/%{version}/ pyghmi/version.py -# If not PBR, use the setup.py.tmpl -sed -e "s/#VERSION#/%{version}/" setup.py.tmpl > setup.py - %build %if 0%{?with_python3} %py3_build -%if %{with docs} %{__python3} setup.py build_sphinx -b html -%endif %endif # with_python3 %if 0%{?with_python2} %py2_build -%if %{with docs} %{__python2} setup.py build_sphinx -b html %endif -%endif # remove the sphinx-build leftovers rm -rf doc/build/html/.{doctrees,buildinfo} @@ -197,19 +171,13 @@ popd %{python2_sitelib}/%{sname}/tests %endif -%if %{with docs} - %files -n python-%{sname}-doc %license LICENSE %doc doc/build/html README.md -%endif # with docs - %changelog -* Fri Aug 6 2021 Pavel Cahyna - 1.5.29-1 -- Updated to 1.5.29. -- Avoid dependency on python-pbr, conditionalize docs build, to allow building in RHEL. - Inspired by python-sushy. +* Wed Jan 27 2021 Fedora Release Engineering - 1.5.19-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild * Fri Nov 06 2020 Joel Capitao - 1.5.19-1 - Updated to 1.5.19.