From f2d86c0b1960ba8fa8cc1630b01264c2a63f3d44 Mon Sep 17 00:00:00 2001 From: Till Hofmann Date: Dec 02 2017 17:25:48 +0000 Subject: Add patch to remove argparse from the requirements The module argparse is built-in and is not provided by any package anymore. This fixes a bug where catkin complained about a missing argparse distribution. --- diff --git a/catkin_pkg.remove-argparse-requirement.patch b/catkin_pkg.remove-argparse-requirement.patch new file mode 100644 index 0000000..dabe2e4 --- /dev/null +++ b/catkin_pkg.remove-argparse-requirement.patch @@ -0,0 +1,11 @@ +diff -ur catkin_pkg-40dbc2dd3ae8b2787cfb2a59776a944d3f1e4655/setup.py catkin_pkg-40dbc2dd3ae8b2787cfb2a59776a944d3f1e4655.remove-argparse-requirement/setup.py +--- catkin_pkg-40dbc2dd3ae8b2787cfb2a59776a944d3f1e4655/setup.py 2017-10-13 00:24:47.000000000 +0200 ++++ catkin_pkg-40dbc2dd3ae8b2787cfb2a59776a944d3f1e4655.remove-argparse-requirement/setup.py 2017-12-02 18:04:44.754018449 +0100 +@@ -31,7 +31,6 @@ + 'long_description': 'Library for retrieving information about catkin packages.', + 'license': 'BSD', + 'install_requires': [ +- 'argparse', + 'docutils', + 'python-dateutil' + ], diff --git a/python-catkin_pkg.spec b/python-catkin_pkg.spec index cccfe72..c114a25 100644 --- a/python-catkin_pkg.spec +++ b/python-catkin_pkg.spec @@ -6,13 +6,14 @@ Name: python-%{module_name} Version: 0.3.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Library for retrieving information about catkin packages License: BSD URL: https://github.com/ros-infrastructure/%{module_name} BuildArch: noarch Source0: https://github.com/ros-infrastructure/%{module_name}/archive/%{commit}/%{module_name}-%{commit}.tar.gz +Patch0: catkin_pkg.remove-argparse-requirement.patch BuildRequires: python2-devel BuildRequires: python-dateutil @@ -56,6 +57,7 @@ Library for retrieving information about catkin packages %prep %setup -qc +%patch0 -p0 mv %{module_name}-%{commit} python2 @@ -144,6 +146,9 @@ popd %endif %changelog +* Sat Dec 02 2017 Till Hofmann - 0.3.8-2 +- Add patch to remove argparse from the requirements + * Wed Oct 25 2017 Ankur Sinha - 0.3.8-1 - Update to new release 0.3.8 (rhbz#1455183)