diff --git a/python-catkin_pkg-0.4.10-argparse.patch b/python-catkin_pkg-0.4.10-argparse.patch new file mode 100644 index 0000000..fa77204 --- /dev/null +++ b/python-catkin_pkg-0.4.10-argparse.patch @@ -0,0 +1,22 @@ +From a88f4f221d9f3b935198c9717f89d397c94e1dc5 Mon Sep 17 00:00:00 2001 +From: Scott K Logan +Date: Fri, 11 Jan 2019 18:44:16 -0800 +Subject: [PATCH] Fix argparse requirement for python 2.7 + +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 78e4ee3..956d9bc 100755 +--- a/setup.py ++++ b/setup.py +@@ -12,7 +12,7 @@ + ] + + # argparse is part of the standard library since Python 2.7 +-if sys.version_info[0] == 2 and sys.version_info[1] <= 7: ++if sys.version_info[0] == 2 and sys.version_info[1] < 7: + install_requires.append('argparse') + + kwargs = { diff --git a/python-catkin_pkg.spec b/python-catkin_pkg.spec index 77ca2c1..4d4df3a 100644 --- a/python-catkin_pkg.spec +++ b/python-catkin_pkg.spec @@ -6,13 +6,16 @@ Name: python-%{srcname} Version: 0.4.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Library for retrieving information about catkin packages License: BSD URL: https://github.com/ros-infrastructure/%{srcname} Source0: https://github.com/ros-infrastructure/%{srcname}/archive/%{version}/%{srcname}-%{version}.tar.gz +# Submitted upstream +Patch0: %{name}-0.4.10-argparse.patch + BuildArch: noarch %description @@ -161,6 +164,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} -m nose -w test -e "(test %endif # with_doc %changelog +* Sat Jan 12 2019 Scott K Logan - 0.4.10-2 +- Add patch for argparse on Python 2.7 + * Fri Jan 11 2019 Scott K Logan - 0.4.10-1 - Update to 0.4.10 - Modernize spec