From 9c43e14bdcdf8936ef2d213ff4eda0a1183df32e Mon Sep 17 00:00:00 2001 From: Chris Hambridge Date: Jun 12 2018 14:18:46 +0000 Subject: Update Python 2 dependency for EPEL support Bug fix for unicode processing (mdvickst@redhat.com) Bug fix for rpm output to /dev/null (mdvickst@redhat.com) --- diff --git a/rho.spec b/rho.spec index 551251b..8e88394 100644 --- a/rho.spec +++ b/rho.spec @@ -1,39 +1,46 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: rho -Version: 0.0.33 -Release: 2%{?dist} +Version: 0.0.34 +Release: 1%{?dist} Summary: An SSH system profiler Group: Applications/Internet License: GPLv2 URL: http://github.com/quipucords/rho -Source0: http://chambridge.fedorapeople.org/rho/rho-0.0.33-1.tar.gz +Source0: http://chambridge.fedorapeople.org/rho/rho-0.0.34-1.tar.gz + +%if 0%{?rhel} +%global py2_prefix python +%else +%global py2_prefix python2 +%endif BuildArch: noarch -BuildRequires: python2-devel -%{?fedora:BuildRequires: python2-setuptools} -%{?rhel:BuildRequires: python-setuptools} +BuildRequires: %{py2_prefix}-devel +BuildRequires: %{py2_prefix}-setuptools BuildRequires: pandoc -Requires: python2-netaddr -%{?fedora:BuildRequires: python2-crypto} -%{?rhel:BuildRequires: python-crypto} +BuildRequires: %{py2_prefix}-crypto +Requires: %{py2_prefix}-netaddr Requires: ansible -Requires: python2-pexpect -Requires: python2-six -Requires: python2-enum34 -Requires: python2-pyyaml +%{?fedora:Requires: python2-pexpect} +%{?rhel:Requires: pexpect} +Requires: %{py2_prefix}-six +Requires: %{py2_prefix}-enum34 +%{?fedora:Requires: python2-pyyaml} +%{?rhel:Requires: PyYAML} %{?rhel:Requires: epel-release} Requires: python2-future Requires: python2-sh -Requires: python2-pyxdg +%{?fedora:Requires: python2-pyxdg} +%{?rhel:Requires: pyxdg} %description Rho is a tool for scanning your network, logging into systems via SSH, and retrieving information about them. %prep -%setup -q -n rho-git-164.96bed03 +%setup -q -n rho-git-168.25d32c6 %build %{__python} setup.py build @@ -59,6 +66,11 @@ cp -rp roles %{buildroot}%{_datadir}/ansible/%{name}/ %{_datadir}/ansible/%{name}/roles/* %changelog +* Mon May 28 2018 Christopher Hambridge 0.0.34-1 +- Update Python 2 dependency for EPEL support +- Bug fix for unicode processing (mdvickst@redhat.com) +- Bug fix for rpm output to /dev/null (mdvickst@redhat.com) + * Thu Apr 19 2018 Iryna Shcherbina - 0.0.33-2 - Update Python 2 dependency declarations to new packaging standards (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)