[python-rosdistro/el6] Disable catkin-sphinx

rmattes rmattes at fedoraproject.org
Sun Feb 9 01:13:16 UTC 2014


commit 0c33e630eddd4ac43dd5772b3f85653dd840f74e
Author: Rich Mattes <richmattes at gmail.com>
Date:   Sat Feb 8 20:13:36 2014 -0500

    Disable catkin-sphinx

 python-rosdistro.spec        |    9 +++++++--
 rosdistro-0.3.4-sphinx.patch |   13 +++++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)
---
diff --git a/python-rosdistro.spec b/python-rosdistro.spec
index 1a775b9..f3dead8 100644
--- a/python-rosdistro.spec
+++ b/python-rosdistro.spec
@@ -10,11 +10,15 @@ Summary:        File format for managing ROS Distributions
 License:        BSD and MIT
 URL:            http://www.ros.org/wiki/rosdistro
 Source0:        https://github.com/ros-infrastructure/%{realname}/archive/%{commit}/%{realname}-%{version}-%{shortcommit}.tar.gz
+# Python-sphinx is too old in epel for catkin-sphinx, remove it
+Patch0:         %{realname}-0.3.4-sphinx.patch
 
 BuildArch:      noarch
+
+BuildRequires:  cmake
 BuildRequires:  PyYAML
-BuildRequires:  python2-devel
-BuildRequires:  python-catkin-sphinx
+BuildRequires:  python-devel
+BuildRequires:  python-docutils
 BuildRequires:  git
 
 %description
@@ -33,6 +37,7 @@ local cache file, to speed up performance for the next query.
 %prep
 %setup -qn %{realname}-%{commit}
 sed -i 's|#!/usr/bin/env python||' src/rosdistro/external/appdirs.py
+%patch0 -p0 -b .sphinx
 
 %build
 %{__python} setup.py build
diff --git a/rosdistro-0.3.4-sphinx.patch b/rosdistro-0.3.4-sphinx.patch
new file mode 100644
index 0000000..d6e379e
--- /dev/null
+++ b/rosdistro-0.3.4-sphinx.patch
@@ -0,0 +1,13 @@
+diff -up ./doc/conf.py.sphinx ./doc/conf.py
+--- ./doc/conf.py.sphinx	2014-02-08 20:10:18.331606273 -0500
++++ ./doc/conf.py	2014-02-08 20:10:38.131891273 -0500
+@@ -25,8 +25,7 @@ from rosdistro._version import __version
+ # They can be extensions coming with Sphinx (named 'sphinx.ext.*') or your
+ # custom ones.
+ extensions = ['sphinx.ext.ifconfig', 'sphinx.ext.todo', 'sphinx.ext.graphviz',
+-              'sphinx.ext.intersphinx', 'sphinx.ext.doctest',
+-              'catkin_sphinx.ShLexer', 'catkin_sphinx.cmake']
++              'sphinx.ext.intersphinx', 'sphinx.ext.doctest']
+ todo_include_todos = True
+ 
+ # Add any paths that contain templates here, relative to this directory.


More information about the scm-commits mailing list