From e7ca27b9d09984624d57a8062a4340a3db07916b Mon Sep 17 00:00:00 2001
From: Scott K Logan <logans@cottsay.net>
Date: Apr 15 2020 20:07:26 +0000
Subject: Update to 0.4.16


---

diff --git a/.gitignore b/.gitignore
index 1020c00..e5b5495 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@
 /catkin_pkg-0.4.12.tar.gz
 /catkin_pkg-0.4.13.tar.gz
 /catkin_pkg-0.4.14.tar.gz
+/catkin_pkg-0.4.16.tar.gz
diff --git a/python-catkin_pkg.spec b/python-catkin_pkg.spec
index 35990e9..231dc66 100644
--- a/python-catkin_pkg.spec
+++ b/python-catkin_pkg.spec
@@ -5,7 +5,7 @@
 %global srcname catkin_pkg
 
 Name:           python-%{srcname}
-Version:        0.4.14
+Version:        0.4.16
 Release:        1%{?dist}
 Summary:        Library for retrieving information about catkin packages
 
@@ -26,7 +26,7 @@ BuildRequires:  python%{python3_pkgversion}-sphinx
 
 %description doc
 HTML API documentation for the Python module '%{srcname}'
-%endif # with_doc
+%endif
 
 
 %if 0%{?with_python2}
@@ -45,15 +45,15 @@ BuildRequires:  python2-setuptools
 Requires:       python2-dateutil
 Requires:       python2-docutils
 Requires:       python2-pyparsing
-%endif # __pythondist_requires
+%endif
 
-%if (0%{?fedora} || 0%{?rhel} >= 8) && (0%{?with_doc})
+%if (!0%{?rhel} || 0%{?rhel} >= 8) && (0%{?with_doc})
 Suggests:       %{name}-doc = %{version}-%{release}
-%endif # (fedora || rhel >= 8) && with_doc
+%endif
 
 %description -n python2-%{srcname}
 %{summary}
-%endif # with_python2
+%endif
 
 
 %if 0%{?with_python3}
@@ -72,15 +72,15 @@ BuildRequires:  python%{python3_pkgversion}-setuptools
 Requires:       python%{python3_pkgversion}-dateutil
 Requires:       python%{python3_pkgversion}-docutils
 Requires:       python%{python3_pkgversion}-pyparsing
-%endif # __pythondist_requires
+%endif
 
-%if (0%{?fedora} || 0%{?rhel} >= 8) && (0%{?with_doc})
+%if (!0%{?rhel} || 0%{?rhel} >= 8) && (0%{?with_doc})
 Suggests:       %{name}-doc = %{version}-%{release}
-%endif # (fedora || rhel >= 8) && with_doc
+%endif
 
 %description -n python%{python3_pkgversion}-%{srcname}
 %{summary}
-%endif # with_python3
+%endif
 
 
 %prep
@@ -90,24 +90,24 @@ Suggests:       %{name}-doc = %{version}-%{release}
 %build
 %if 0%{?with_python2}
 %py2_build
-%endif # with_python2
+%endif
 
 %if 0%{?with_python3}
 %py3_build
-%endif # with_python3
+%endif
 
 %if 0%{?with_doc}
 PYTHONPATH=$PWD/build/lib \
     PYTHONDONTWRITEBYTECODE=1 \
     %make_build -C doc html SPHINXBUILD=sphinx-build-%{python3_version} SPHINXAPIDOC=sphinx-apidoc-%{python3_version}
 rm doc/_build/html/.buildinfo
-%endif # with_doc
+%endif
 
 
 %install
 %if 0%{?with_python2}
 %py2_install
-%endif # with_python2
+%endif
 
 %if 0%{?with_python3}
 %py3_install -- --install-scripts %{_bindir}/python%{python3_pkgversion}
@@ -115,7 +115,7 @@ pushd %{buildroot}%{_bindir}/python%{python3_pkgversion}
 for i in *; do mv $i ../python%{python3_pkgversion}-$i; done
 popd
 rmdir %{buildroot}%{_bindir}/python%{python3_pkgversion}
-%endif # with_python3
+%endif
 
 
 %check
@@ -124,21 +124,21 @@ rmdir %{buildroot}%{_bindir}/python%{python3_pkgversion}
 # Skip tests that use python 2.7 assertions
 PYTHONPATH=%{buildroot}%{python2_sitelib} nosetests -w test \
     -e "(test_check_known_attributes|test_create_package_template|test_flake8|test_package_decorator_init|test_topological_order_packages_with_duplicates|test_validate_metapackage|test_validate_package)"
-%else # python-2.6
+%else
 PYTHONPATH=%{buildroot}%{python2_sitelib} %{__python2} -m nose -w test -e "(test_flake8)"
-%endif # python-2.6
-%endif # with_python2
+%endif
+%endif
 
 %if 0%{?with_python3}
 PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} -m nose -w test -e "(test_flake8)"
-%endif # with_python3
+%endif
 
 
 %if 0%{?with_doc}
 %files doc
 %license LICENSE
 %doc doc/_build/html
-%endif # with_doc
+%endif
 
 %if 0%{?with_python2}
 %files -n python2-%{srcname}
@@ -153,7 +153,7 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} -m nose -w test -e "(test
 %{_bindir}/catkin_prepare_release
 %{_bindir}/catkin_tag_changelog
 %{_bindir}/catkin_test_changelog
-%endif # with_python2
+%endif
 
 %if 0%{?with_python3}
 %files -n python%{python3_pkgversion}-%{srcname}
@@ -168,10 +168,13 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} -m nose -w test -e "(test
 %{_bindir}/python%{python3_pkgversion}-catkin_prepare_release
 %{_bindir}/python%{python3_pkgversion}-catkin_tag_changelog
 %{_bindir}/python%{python3_pkgversion}-catkin_test_changelog
-%endif # with_python3
+%endif
 
 
 %changelog
+* Wed Apr 15 2020 Scott K Logan <logans@cottsay.net> - 0.4.16-1
+- Update to 0.4.16 (rhbz#1782360)
+
 * Wed Oct 30 2019 Scott K Logan <logans@cottsay.net> - 0.4.14-1
 - Update to 0.4.14 (rhbz#1762232)
 
diff --git a/sources b/sources
index d24acd4..ce101c9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (catkin_pkg-0.4.14.tar.gz) = fd2fe72b88e1dd93a1e4b7d0545bfad01b4459822ac20fc38419c1c1e168567d013a44870f85a47cdb263604928f97a32483a9467579f739a5745074c60e755a
+SHA512 (catkin_pkg-0.4.16.tar.gz) = df7cc31197ce7c618474a8b80c4da45347e000c330655de0cf87c8488219542801c54f3cedeb5ef382bcd43613600878056f6a499c8e5d72054bddabd8f98d95