From 3dd0d57f12f8f376305b2b1deb7454061b3a2676 Mon Sep 17 00:00:00 2001 From: Scott K Logan Date: May 09 2020 04:20:22 +0000 Subject: Update to 0.1.10 --- diff --git a/.gitignore b/.gitignore index 426ef9c..ae553c8 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /osrf_pycommon-0.1.7.tar.gz /osrf_pycommon-0.1.8.tar.gz /osrf_pycommon-0.1.9.tar.gz +/osrf_pycommon-0.1.10.tar.gz diff --git a/python-osrf-pycommon.spec b/python-osrf-pycommon.spec index 41597fa..ed4f005 100644 --- a/python-osrf-pycommon.spec +++ b/python-osrf-pycommon.spec @@ -5,7 +5,7 @@ %global pkgname osrf-pycommon Name: python-%{pkgname} -Version: 0.1.9 +Version: 0.1.10 Release: 1%{?dist} Summary: Commonly needed Python modules used by software developed at OSRF @@ -47,13 +47,13 @@ BuildRequires: python2-setuptools BuildRequires: python2-trollius %{?python_provide:%python_provide python2-%{pkgname}} -%if %{undefined python_disable_dependency_generator} +%if %{undefined __pythondist_requires} Requires: python2-trollius -%endif # python_disable_dependency_generator +%endif -%if 0%{?fedora} || 0%{?rhel} >= 8 +%if !0%{?rhel} || 0%{?rhel} >= 8 Suggests: %{name}-doc = %{version}-%{release} -%endif # fedora || rhel >= 8 +%endif %description -n python2-%{pkgname} osrf_pycommon is a python package which contains commonly used Python @@ -65,7 +65,7 @@ The functionality provided here should be generic enough to be reused in arbitrary scenarios and should avoid bringing in dependencies which are not part of the standard Python library. Where possible Windows and Linux/OS X should be supported, and where it cannot it should be gracefully degrading. -%endif # with_python2 +%endif %if 0%{?with_python3} @@ -77,9 +77,9 @@ BuildRequires: python%{python3_pkgversion}-nose BuildRequires: python%{python3_pkgversion}-setuptools %{?python_provide:%python_provide python%{python3_pkgversion}-%{pkgname}} -%if 0%{?fedora} || 0%{?rhel} >= 8 +%if !0%{?rhel} || 0%{?rhel} >= 8 Suggests: %{name}-doc = %{version}-%{release} -%endif # fedora || rhel >= 8 +%endif %description -n python%{python3_pkgversion}-%{pkgname} osrf_pycommon is a python package which contains commonly used Python @@ -91,7 +91,7 @@ The functionality provided here should be generic enough to be reused in arbitrary scenarios and should avoid bringing in dependencies which are not part of the standard Python library. Where possible Windows and Linux/OS X should be supported, and where it cannot it should be gracefully degrading. -%endif # with_python3 +%endif %prep @@ -106,14 +106,15 @@ sed -i "\\|('share/ament_index/resource_index/packages',|$!{ \\|('share/ament_index/resource_index/packages',\n *\\['resource/' + package_name\\])|d }" setup.py + %build %if 0%{?with_python2} %py2_build -%endif # with_python2 +%endif %if 0%{?with_python3} %py3_build -%endif # with_python3 +%endif %make_build -C docs html man SPHINXBUILD=sphinx-build-%{python3_version} rm docs/_build/html/.buildinfo @@ -123,11 +124,11 @@ rm docs/_build/html/.buildinfo %if 0%{?with_python2} %py2_install rm -rf %{buildroot}%{python2_sitelib}/%{srcname}/process_utils/async_execute_process_asyncio -%endif # with_python2 +%endif %if 0%{?with_python3} %py3_install -%endif # with_python3 +%endif install -p -m0644 -D docs/_build/man/%{srcname}.1 %{buildroot}%{_mandir}/man1/%{srcname}.1 @@ -135,11 +136,11 @@ install -p -m0644 -D docs/_build/man/%{srcname}.1 %{buildroot}%{_mandir}/man1/%{ %check %if 0%{?with_python2} PYTHONASYNCIODEBUG=1 %{__python2} -m nose tests -e test_code_format -%endif # with_python2 +%endif %if 0%{?with_python3} PYTHONASYNCIODEBUG=1 %{__python3} -m nose tests -e test_code_format -%endif # with_python3 +%endif %files doc @@ -153,7 +154,7 @@ PYTHONASYNCIODEBUG=1 %{__python3} -m nose tests -e test_code_format %{python2_sitelib}/%{srcname}/ %{python2_sitelib}/%{srcname}-%{version}-py%{python2_version}.egg-info/ %{_mandir}/man1/%{srcname}.1.gz -%endif # with_python2 +%endif %if 0%{?with_python3} %files -n python%{python3_pkgversion}-%{pkgname} @@ -162,10 +163,13 @@ PYTHONASYNCIODEBUG=1 %{__python3} -m nose tests -e test_code_format %{python3_sitelib}/%{srcname}/ %{python3_sitelib}/%{srcname}-%{version}-py%{python3_version}.egg-info/ %{_mandir}/man1/%{srcname}.1.gz -%endif # with_python3 +%endif %changelog +* Fri May 08 2020 Scott K Logan - 0.1.10-1 +- Update to 0.1.10 (rhbz#1833518) + * Wed Oct 30 2019 Scott K Logan - 0.1.9-1 - Update to 0.1.9 (rhbz#1762208) diff --git a/sources b/sources index 0cd98ed..dd43b44 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (osrf_pycommon-0.1.9.tar.gz) = a9ffa1114c095052d91545b7207bc57a6f9b107060f562d3d568bc2e9c259468f506b0640d7fe03d0b825cd84c064e5d67378ad6235613efbf5b63140063a7e1 +SHA512 (osrf_pycommon-0.1.10.tar.gz) = 5d53ea0c3c410a99964330dc22dcbcb3cd8892a359fee2061acc15ddb46e334ff757e8aa5b776fef381246c58e9834003ac818624da4b8e95552f214f3d9e6bb