From 1bd0fa6c791107b6ba67cb04d24b832d19ec0658 Mon Sep 17 00:00:00 2001 From: Rich Mattes Date: Apr 12 2014 15:11:51 +0000 Subject: Update to release 0.10.27 - Build html documentation --- diff --git a/.gitignore b/.gitignore index 4a03954..81ed8c4 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /rosdep-0.10.18-91fb685.tar.gz /rosdep-0.10.21-4029af6.tar.gz /rosdep-0.10.25-d95ac0c.tar.gz +/rosdep-0.10.27-62905bb.tar.gz diff --git a/python-rosdep.spec b/python-rosdep.spec index 7aa2730..6b6242c 100644 --- a/python-rosdep.spec +++ b/python-rosdep.spec @@ -1,9 +1,9 @@ -%global commit d95ac0cba77e02f6f79d551511c18aa0d5055579 +%global commit 62905bb516c7842c9d98050a5c7e57b51f0d3a4d %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global realname rosdep Name: python-rosdep -Version: 0.10.25 +Version: 0.10.27 Release: 1%{?dist} Summary: ROS System Dependency Installer @@ -14,15 +14,16 @@ Source0: https://github.com/ros-infrastructure/%{realname}/archive/%{comm # 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 +#Patch1: %{realname}-0.10.14-catkinsphinx.patch BuildArch: noarch BuildRequires: PyYAML BuildRequires: python-catkin_pkg +BuildRequires: python-catkin-sphinx BuildRequires: python-devel BuildRequires: python-nose BuildRequires: python-rospkg -BuildRequires: python-setuptools-devel +BuildRequires: python-devel BuildRequires: python-sphinx Requires: PyYAML @@ -43,14 +44,12 @@ specify a dependency on 'boost'. %prep %setup -qn %{realname}-%{commit} %patch0 -p0 -b .pythonpip -%patch1 -p0 -b .catkinsphinx %build %{__python} setup.py build pushd doc make man -# HTML requires ros-theme -#make html +make html popd @@ -68,8 +67,11 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/ros/rosdep/sources.list.d/20-default.list sed -i 's|#!/usr/bin/env python||' $RPM_BUILD_ROOT%{python_sitelib}/rosdep2/*.py sed -i 's|#!/usr/bin/env python||' $RPM_BUILD_ROOT%{python_sitelib}/rosdep2/platforms/*.py +# Get rid of hidden file in documentation folder +rm -f doc/_build/.buildinfo %files +%doc LICENSE README.md doc/_build/html %{_bindir}/* %{python_sitelib}/%{realname}-%{version}-py?.?.egg-info %{python_sitelib}/%{realname}2 @@ -81,6 +83,10 @@ sed -i 's|#!/usr/bin/env python||' $RPM_BUILD_ROOT%{python_sitelib}/rosdep2/plat %changelog +* Sat Apr 12 2014 Rich Mattes - 0.10.27-1 +- Update to release 0.10.27 +- Build html documentation + * Sat Feb 08 2014 Rich Mattes - 0.10.25-1 - Update to release 0.10.25 diff --git a/rosdep-0.10.14-catkinsphinx.patch b/rosdep-0.10.14-catkinsphinx.patch deleted file mode 100644 index 69526bd..0000000 --- a/rosdep-0.10.14-catkinsphinx.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -up ./doc/conf.py.catkinsphinx ./doc/conf.py ---- ./doc/conf.py.catkinsphinx 2013-03-18 21:46:34.214730022 -0400 -+++ ./doc/conf.py 2013-03-18 21:46:49.177270617 -0400 -@@ -16,7 +16,7 @@ import sys, os - import sys - sys.path.insert(0, '../src') - --import catkin_sphinx -+#import catkin_sphinx - from rosdep2 import __version__ - - # If extensions (or modules to document with autodoc) are in another directory, -@@ -97,9 +97,9 @@ pygments_style = 'sphinx' - - # The theme to use for HTML and HTML Help pages. See the documentation for - # a list of builtin themes. --html_theme_path = [os.path.join(os.path.dirname(catkin_sphinx.__file__), 'theme')] --html_theme = 'ros-theme' --html_logo = 'ros.png' -+#html_theme_path = [os.path.join(os.path.dirname(catkin_sphinx.__file__), 'theme')] -+#html_theme = 'ros-theme' -+#html_logo = 'ros.png' - - # Theme options are theme-specific and customize the look and feel of a theme - # further. For a list of options available for each theme, see the diff --git a/sources b/sources index 5bdccc4..b067d83 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9f6857c4b77f0a51a6481f59127d4707 rosdep-0.10.25-d95ac0c.tar.gz +3588ed1fbf9a7bdf97d1e6d594a8bc95 rosdep-0.10.27-62905bb.tar.gz