From 12b90a6b7f71b87cac549957cda7408fc149055a Mon Sep 17 00:00:00 2001
From: Scott K Logan <logans@cottsay.net>
Date: Jun 25 2020 17:21:59 +0000
Subject: Merge branch 'epel8-playground' into epel8


---

diff --git a/.gitignore b/.gitignore
index bbf8abe..91193c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,4 @@
 /catkin_pkg-0.4.16.tar.gz
 /catkin_pkg-0.4.19.tar.gz
 /catkin_pkg-0.4.20.tar.gz
+/catkin_pkg-0.4.22.tar.gz
diff --git a/python-catkin_pkg.spec b/python-catkin_pkg.spec
index 646195c..0617cc9 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.20
+Version:        0.4.22
 Release:        1%{?dist}
 Summary:        Library for retrieving information about catkin packages
 
@@ -98,8 +98,8 @@ Suggests:       %{name}-doc = %{version}-%{release}
 
 %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}
+  PYTHONDONTWRITEBYTECODE=1 \
+  %make_build -C doc html SPHINXBUILD=sphinx-build-%{python3_version} SPHINXAPIDOC=sphinx-apidoc-%{python3_version}
 rm doc/_build/html/.buildinfo
 %endif
 
@@ -123,7 +123,7 @@ rmdir %{buildroot}%{_bindir}/python%{python3_pkgversion}
 %if "%{python2_version}" == "2.6"
 # 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)"
+  -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
 PYTHONPATH=%{buildroot}%{python2_sitelib} %{__python2} -m nose -w test -e "(test_flake8)"
 %endif
@@ -172,6 +172,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} -m nose -w test -e "(test
 
 
 %changelog
+* Thu Jun 25 2020 Scott K Logan <logans@cottsay.net> - 0.4.22-1
+- Update to 0.4.22 (rhbz#1850827)
+
 * Fri May 29 2020 Scott K Logan <logans@cottsay.net> - 0.4.20-1
 - Update to 0.4.20 (rhbz#1835055)
 
diff --git a/sources b/sources
index 04bc76c..c1ba435 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (catkin_pkg-0.4.20.tar.gz) = 7b2b25186b9fefd3acd11b785562c6481e9f37f568d66a674d314318686d3e0d2e8ce0cacab126411de78c71e2b8f378439d442d3fd041b3e92a25e95cef4e19
+SHA512 (catkin_pkg-0.4.22.tar.gz) = e7119dde7fc70503d8b8cedf505d93aef719039a836186738d017500f8d53cbd73ae4f017cb8d86cc007978066e6471b971039387a07e2eb3c6894569a30946b