diff --git a/.gitignore b/.gitignore index 1f50450..9c327bf 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /rosdep-0.10.32-c0d51a5.tar.gz /rosdep-0.10.33-6dcd852.tar.gz /rosdep-0.11.0-13a9b20.tar.gz +/rosdep-23f30f7e42f4a7184de001fe1ef21ad44a015a4c.tar.gz diff --git a/python-rosdep.spec b/python-rosdep.spec index d804397..5715dff 100644 --- a/python-rosdep.spec +++ b/python-rosdep.spec @@ -1,22 +1,17 @@ -%global commit 13a9b2095a3c68b18d94fd6db58bbac48a336361 +%global commit 23f30f7e42f4a7184de001fe1ef21ad44a015a4c %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global realname rosdep Name: python-%{realname} -Version: 0.11.0 +Version: 0.11.2 Release: 1%{?dist} Summary: ROS System Dependency Installer License: BSD URL: http://ros.org/wiki/%{realname} -Source0: https://github.com/ros-infrastructure/%{realname}/archive/%{commit}/%{realname}-%{version}-%{shortcommit}.tar.gz -# Change all "pip" executable references to "python-pip" -# Fedora-only patch, not submitted upstream. -Patch0: %{realname}-0.10.32-pythonpip.patch +Source0: https://github.com/ros-infrastructure/%{realname}/archive/%{commit}/%{realname}-%{commit}.tar.gz # Disable the viewcode extension in sphinx config -Patch1: %{realname}-0.10.27-sphinx.patch -# Disable nose: el6 version is too old -Patch2: %{realname}-0.11.0-nose.patch +Patch0: %{realname}-0.10.27-sphinx.patch BuildArch: noarch @@ -26,7 +21,7 @@ BuildRequires: python-catkin-sphinx BuildRequires: python-devel BuildRequires: python-nose1.1 BuildRequires: python-rosdistro >= 0.4.0 -BuildRequires: python-rospkg +BuildRequires: python-rospkg >= 1.0.34 BuildRequires: python-sphinx Requires: PyYAML >= 3.1 @@ -47,9 +42,7 @@ specify a dependency on 'boost'. %prep %setup -qn %{realname}-%{commit} -%patch0 -p0 -b .pythonpip -%patch1 -p0 -b .sphinx -%patch2 -p0 -b .nose +%patch0 -p0 -b .sphinx %build @@ -83,7 +76,8 @@ rm -f doc/_build/.buildinfo %files -%doc LICENSE README.md doc/_build/html +%doc LICENSE +%doc README.md doc/_build/html %{_bindir}/* %{python_sitelib}/%{realname}-%{version}-py?.?.egg-info %{python_sitelib}/%{realname}2 @@ -94,6 +88,10 @@ rm -f doc/_build/.buildinfo %changelog +* Wed Mar 04 2015 Rich Mattes - 0.11.2-1 +- Update to release 0.11.2 +- Update to latest github guidelines + * Tue Dec 30 2014 Rich Mattes - 0.11.0-1 - Update to release 0.11.0 diff --git a/rosdep-0.10.32-pythonpip.patch b/rosdep-0.10.32-pythonpip.patch deleted file mode 100644 index 72c482a..0000000 --- a/rosdep-0.10.32-pythonpip.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- ../rosdep-0.10.14.orig/src/rosdep2/platforms/pip.py 2014-10-17 13:07:56.000000000 -0700 -+++ src/rosdep2/platforms/pip.py 2014-10-18 22:18:47.627614149 -0700 -@@ -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 [self.elevate_priv(['pip', 'install', '-U', p]) for p in packages] -+ return [self.elevate_priv(['python-pip', 'install', '-U', p]) for p in packages] - diff --git a/rosdep-0.11.0-nose.patch b/rosdep-0.11.0-nose.patch deleted file mode 100644 index 94ec6ae..0000000 --- a/rosdep-0.11.0-nose.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up ./setup.py.nose ./setup.py ---- ./setup.py.nose 2015-01-16 19:19:44.068598472 -0500 -+++ ./setup.py 2015-01-16 19:20:29.622215921 -0500 -@@ -9,8 +9,6 @@ setup( - packages=['rosdep2', 'rosdep2.platforms'], - package_dir={'': 'src'}, - install_requires=['catkin_pkg', 'rospkg', 'rosdistro >= 0.4.0', 'PyYAML >= 3.1'], -- setup_requires=['nose >= 1.0'], -- test_suite='nose.collector', - test_requires=['mock'], - scripts=['scripts/rosdep', 'scripts/rosdep-source'], - author="Tully Foote, Ken Conley", diff --git a/sources b/sources index 23761b1..f8beb68 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -36ac79171e03ef1b29ed5206bb0130bb rosdep-0.11.0-13a9b20.tar.gz +326fd80dc086f6776dac2a82cfb973b1 rosdep-23f30f7e42f4a7184de001fe1ef21ad44a015a4c.tar.gz