[python-rosdep/el6] Fix nose patch
rmattes
rmattes at fedoraproject.org
Sat Jan 17 00:21:01 UTC 2015
commit 2e4850f1a57f93c95c9bb527ca81475217f3ec03
Author: Rich Mattes <richmattes at gmail.com>
Date: Fri Jan 16 19:21:17 2015 -0500
Fix nose patch
python-rosdep.spec | 2 +-
...-0.10.32-nose.patch => rosdep-0.11.0-nose.patch | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/python-rosdep.spec b/python-rosdep.spec
index af01f69..d804397 100644
--- a/python-rosdep.spec
+++ b/python-rosdep.spec
@@ -16,7 +16,7 @@ Patch0: %{realname}-0.10.32-pythonpip.patch
# Disable the viewcode extension in sphinx config
Patch1: %{realname}-0.10.27-sphinx.patch
# Disable nose: el6 version is too old
-Patch2: %{realname}-0.10.32-nose.patch
+Patch2: %{realname}-0.11.0-nose.patch
BuildArch: noarch
diff --git a/rosdep-0.10.32-nose.patch b/rosdep-0.11.0-nose.patch
similarity index 67%
rename from rosdep-0.10.32-nose.patch
rename to rosdep-0.11.0-nose.patch
index 4e5292b..94ec6ae 100644
--- a/rosdep-0.10.32-nose.patch
+++ b/rosdep-0.11.0-nose.patch
@@ -1,10 +1,10 @@
diff -up ./setup.py.nose ./setup.py
---- ./setup.py.nose 2014-02-08 18:45:42.932991412 -0500
-+++ ./setup.py 2014-02-08 18:45:49.311233682 -0500
+--- ./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.3.0', 'PyYAML >= 3.1'],
+ install_requires=['catkin_pkg', 'rospkg', 'rosdistro >= 0.4.0', 'PyYAML >= 3.1'],
- setup_requires=['nose >= 1.0'],
- test_suite='nose.collector',
test_requires=['mock'],
More information about the scm-commits
mailing list