diff --git a/catkin_pkg.remove-argparse-requirement.patch b/catkin_pkg.remove-argparse-requirement.patch deleted file mode 100644 index dabe2e4..0000000 --- a/catkin_pkg.remove-argparse-requirement.patch +++ /dev/null @@ -1,11 +0,0 @@ -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 3d1a56f..65053e4 100644 --- a/python-catkin_pkg.spec +++ b/python-catkin_pkg.spec @@ -4,14 +4,13 @@ Name: python-%{module_name} Version: 0.3.9 -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/%{version}/%{name}-%{version}.tar.gz -Patch0: catkin_pkg.remove-argparse-requirement.patch BuildRequires: python2-devel BuildRequires: python-dateutil @@ -55,7 +54,6 @@ Library for retrieving information about catkin packages %prep %setup -qc -%patch0 -p0 mv %{module_name}-%{version} python2 @@ -68,6 +66,10 @@ find python2 -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python2}|' sed -i "s/ 'catkin_/ 'python3-catkin_/g" python3/setup.py +# remove argparse requirement +sed -i '/argparse/ d' python2/setup.py +sed -i '/argparse/ d' python3/setup.py + %build pushd python2 %{__python2} setup.py build @@ -144,6 +146,9 @@ popd %endif %changelog +* Sun Dec 17 2017 Ankur Sinha - 0.3.9-2 +- Remove patch, use sed instead to make it version independent + * Sun Dec 17 2017 Ankur Sinha - 0.3.9-1 - Update to latest releas 0.3.9 (rhbz#1508241)