[python-rospkg/f19] Update to release 1.0.20

[rmattes]

commit f765ce4d7ce508be5c732f93e6b63b9cea4eaac3
Author: Rich Mattes <richmattes at gmail.com>
Date:   Mon Mar 18 19:40:34 2013 -0400

    Update to release 1.0.20

 .gitignore                       |    1 +
 python-rospkg.spec               |   15 ++++++++++-----
 rospkg-0.1.20-catkinsphinx.patch |   23 +++++++++++++++++++++++
 sources                          |    2 +-
 4 files changed, 35 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 32100d6..93704a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /ros-rospkg-1.0.6-0-g88888b7.tar.gz
 /ros-rospkg-1.0.10-0-gd1ba5af.tar.gz
 /ros-rospkg-1.0.18-0-g38332a1.tar.gz
+/ros-rospkg-1.0.20-0-g0a4448e.tar.gz
diff --git a/python-rospkg.spec b/python-rospkg.spec
index 98bd5fd..b7508c9 100644
--- a/python-rospkg.spec
+++ b/python-rospkg.spec
@@ -1,15 +1,17 @@
-%global gitrev 38332a1
+%global gitrev 0a4448e
 %global realname rospkg
 
 Name:           python-rospkg
-Version:        1.0.18
-Release:        2%{?dist}
+Version:        1.0.20
+Release:        1.20130318git%{gitrev}%{?dist}
 Summary:        Utilities for ROS package, stack, and distribution information
 
 License:        BSD
 URL:            http://ros.org/wiki/rospkg
-# wget --content-disposition https://github.com/ros/rospkg/tarball/1.0.18
+# wget --content-disposition https://github.com/ros/rospkg/tarball/1.0.20
 Source0:        ros-%{realname}-%{version}-0-g%{gitrev}.tar.gz
+# Remove dependency on catkin-sphinx for now
+Patch0:         rospkg-0.1.20-catkinsphinx.patch
 BuildArch:      noarch
 
 BuildRequires:  python-devel
@@ -24,7 +26,7 @@ release your code for others to use.
 
 %prep
 %setup -q -n ros-%{realname}-%{gitrev}
-
+%patch0 -p0 -b .catkinsphinx
 
 %build
 %{__python} setup.py build
@@ -50,6 +52,9 @@ sed -i 's|#!/usr/bin/env python||' $RPM_BUILD_ROOT%{python_sitelib}/%{realname}/
 %{_datadir}/%{realname}
 
 %changelog
+* Mon Mar 18 2013 Rich Mattes <richmattes at gmail.com> - 1.0.20-1.20130318git0a4448e
+- Update to release 1.0.20
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.18-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/rospkg-0.1.20-catkinsphinx.patch b/rospkg-0.1.20-catkinsphinx.patch
new file mode 100644
index 0000000..9768fdb
--- /dev/null
+++ b/rospkg-0.1.20-catkinsphinx.patch
@@ -0,0 +1,23 @@
+diff -up ./doc/conf.py.catkinsphinx ./doc/conf.py
+--- ./doc/conf.py.catkinsphinx	2013-03-18 19:34:09.401189343 -0400
++++ ./doc/conf.py	2013-03-18 19:34:57.338961510 -0400
+@@ -14,7 +14,7 @@
+ import sys, os
+ sys.path.insert(0, os.path.abspath('../src'))
+ import rospkg
+-import catkin_sphinx
++#import catkin_sphinx
+ 
+ # If extensions (or modules to document with autodoc) are in another directory,
+ # add these directories to sys.path here. If the directory is relative to the
+@@ -100,8 +100,8 @@ 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_theme_path = [os.path.join(os.path.dirname(catkin_sphinx.__file__), 'theme')]
++#html_theme = 'ros-theme'
+ 
+ # 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 0b11e79..425b70f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9e608e084f1ef20e271499efc896396a  ros-rospkg-1.0.18-0-g38332a1.tar.gz
+2a1b8a6ceae3d821ae5fd4fbdddce9f3  ros-rospkg-1.0.20-0-g0a4448e.tar.gz