diff --git a/.gitignore b/.gitignore index b84e675..f37a203 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /ros-rosdep-0.10.7-0-ga9d29d2.tar.gz +/ros-rosdep-0.10.14-0-g76a8fef.tar.gz diff --git a/python-rosdep.spec b/python-rosdep.spec index 53b9e71..c600edc 100644 --- a/python-rosdep.spec +++ b/python-rosdep.spec @@ -1,14 +1,19 @@ -%global gitrev a9d29d2 +%global gitrev 76a8fef %global realname rosdep Name: python-rosdep -Version: 0.10.7 -Release: 1.20121028git%{gitrev}%{?dist} +Version: 0.10.14 +Release: 1.20130318git%{gitrev}%{?dist} Summary: ROS System Dependency Installer License: BSD URL: http://ros.org/wiki/rosdep -# wget --content-disposition https://github.com/ros/rosdep/tarball/0.10.7 +# wget --content-disposition https://github.com/ros/rosdep/tarball/0.10.14 Source0: ros-%{realname}-%{version}-0-g%{gitrev}.tar.gz +# Change all "pip" executable references to "python-pip" +# Fedora-only patch, not submitted upstream. +Patch0: %{realname}-0.10.14-pythonpip.patch +# Disable catkin-sphinx for now, until it's packaged +Patch1: %{realname}-0.10.14-catkinsphinx.patch BuildArch: noarch BuildRequires: PyYAML @@ -34,7 +39,8 @@ specify a dependency on 'boost'. %prep %setup -q -n ros-%{realname}-%{gitrev} - +%patch0 -p0 -b .pythonpip +%patch1 -p0 -b .catkinsphinx %build %{__python} setup.py build @@ -72,6 +78,11 @@ sed -i 's|#!/usr/bin/env python||' $RPM_BUILD_ROOT%{python_sitelib}/rosdep2/plat %changelog +* Mon Mar 18 2013 Rich Mattes - 0.10.14-1.20130318git76a8fef +- Update to release 0.10.14 +- Fix installer to look for python-pip instead of pip (rhbz922296) +- Move rosdep cache to /var/cache instead of /etc + * Sun Oct 28 2012 Rich Mattes - 0.10.7-1.20121028gita9d29d2 - Update to 0.10.7 - Depend on /etc/ros from ros-release diff --git a/rosdep-0.10.14-pythonpip.patch b/rosdep-0.10.14-pythonpip.patch new file mode 100644 index 0000000..6d813af --- /dev/null +++ b/rosdep-0.10.14-pythonpip.patch @@ -0,0 +1,28 @@ +--- ../rosdep-0.10.14.orig/src/rosdep2/platforms/pip.py 2013-02-20 11:04:36.000000000 +1100 ++++ src/rosdep2/platforms/pip.py 2013-03-16 13:32:51.651890938 +1100 +@@ -44,7 +44,7 @@ + + def is_pip_installed(): + try: +- subprocess.Popen(['pip'], stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate() ++ subprocess.Popen(['python-pip'], stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate() + return True + except OSError: + return False +@@ -57,7 +57,7 @@ + """ + if exec_fn is None: + exec_fn = read_stdout +- pkg_list = exec_fn(['pip', 'freeze']).split('\n') ++ pkg_list = exec_fn(['python-pip', 'freeze']).split('\n') + + ret_list = [] + for pkg in pkg_list: +@@ -81,5 +81,5 @@ + if not packages: + return [] + else: +- return [['sudo', 'pip', 'install', '-U', p] for p in packages] ++ return [['sudo', 'python-pip', 'install', '-U', p] for p in packages] + + diff --git a/sources b/sources index aa6b6d2..d4aa8a4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -342ddba8b97ca44d89926505ad8fb210 ros-rosdep-0.10.7-0-ga9d29d2.tar.gz +2bee6ec4182495149fa88c5bca81080e ros-rosdep-0.10.14-0-g76a8fef.tar.gz