diff --git a/.gitignore b/.gitignore index c5f79ba..1020c00 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /catkin_pkg-0.4.11.tar.gz /catkin_pkg-0.4.12.tar.gz /catkin_pkg-0.4.13.tar.gz +/catkin_pkg-0.4.14.tar.gz diff --git a/python-catkin_pkg.spec b/python-catkin_pkg.spec index b063f93..35990e9 100644 --- a/python-catkin_pkg.spec +++ b/python-catkin_pkg.spec @@ -1,12 +1,12 @@ %{?!_without_doc:%global with_doc 0%{?_with_doc:1} || !0%{?rhel} || 0%{?rhel} >= 7} -%{?!_without_python2:%global with_python2 0%{?_with_python2:1} || !(0%{?rhel} >= 8)} +%{?!_without_python2:%global with_python2 0%{?_with_python2:1} || !(0%{?fedora} >= 32 || 0%{?rhel} >= 8)} %{?!_without_python3:%global with_python3 0%{?_with_python3:1} || !0%{?rhel} || 0%{?rhel} >= 7} %global srcname catkin_pkg Name: python-%{srcname} -Version: 0.4.13 -Release: 2%{?dist} +Version: 0.4.14 +Release: 1%{?dist} Summary: Library for retrieving information about catkin packages License: BSD @@ -47,9 +47,9 @@ Requires: python2-docutils Requires: python2-pyparsing %endif # __pythondist_requires -%if (0%{?fedora}) && (0%{?with_doc}) +%if (0%{?fedora} || 0%{?rhel} >= 8) && (0%{?with_doc}) Suggests: %{name}-doc = %{version}-%{release} -%endif # fedora && with_doc +%endif # (fedora || rhel >= 8) && with_doc %description -n python2-%{srcname} %{summary} @@ -74,9 +74,9 @@ Requires: python%{python3_pkgversion}-docutils Requires: python%{python3_pkgversion}-pyparsing %endif # __pythondist_requires -%if (0%{?fedora}) && (0%{?with_doc}) +%if (0%{?fedora} || 0%{?rhel} >= 8) && (0%{?with_doc}) Suggests: %{name}-doc = %{version}-%{release} -%endif # fedora && with_doc +%endif # (fedora || rhel >= 8) && with_doc %description -n python%{python3_pkgversion}-%{srcname} %{summary} @@ -172,6 +172,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} -m nose -w test -e "(test %changelog +* Wed Oct 30 2019 Scott K Logan - 0.4.14-1 +- Update to 0.4.14 (rhbz#1762232) + * Mon Aug 19 2019 Miro HronĨok - 0.4.13-2 - Rebuilt for Python 3.8 diff --git a/sources b/sources index dfb8095..d24acd4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (catkin_pkg-0.4.13.tar.gz) = b971019fe2f8e66639d271ce3a7933368a4af7658d143cb042a315492926a4b0c3593dc9f784ea75150aa048266219fe80f2a104adc6d361a6725d4b24aef330 +SHA512 (catkin_pkg-0.4.14.tar.gz) = fd2fe72b88e1dd93a1e4b7d0545bfad01b4459822ac20fc38419c1c1e168567d013a44870f85a47cdb263604928f97a32483a9467579f739a5745074c60e755a