[python-rosdep/el6] Update to release 0.10.27

rmattes rmattes at fedoraproject.org
Mon Apr 14 23:31:28 UTC 2014


commit 23521166a47a5efe5fa55b7e2911f6231d4c6746
Author: Rich Mattes <richmattes at gmail.com>
Date:   Sat Apr 12 11:11:51 2014 -0400

    Update to release 0.10.27
    
    - Build html documentation
    
    Conflicts:
    	python-rosdep.spec
    	rosdep-0.10.25-catkinsphinx.patch

 .gitignore         |    1 +
 python-rosdep.spec |   20 +++++++++++++-------
 sources            |    2 +-
 3 files changed, 15 insertions(+), 8 deletions(-)
---
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 4c3d3a8..0ceb7e6 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
 
@@ -13,18 +13,18 @@ Source0:        https://github.com/ros-infrastructure/%{realname}/archive/%{comm
 # Change all "pip" executable references to "python-pip"
 # Fedora-only patch, not submitted upstream.
 Patch0:         %{realname}-0.10.14-pythonpip.patch
-# Disable viewcode and catkin-sphinx for now, until it's packaged
-Patch1:         %{realname}-0.10.25-catkinsphinx.patch
 # Disable nose: el6 version is too old
 Patch2:         %{realname}-0.10.14-nose.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
@@ -44,12 +44,11 @@ specify a dependency on 'boost'.
 %prep
 %setup -qn %{realname}-%{commit}
 %patch0 -p0 -b .pythonpip
-%patch1 -p0 -b .catkinsphinx
 %patch2 -p0 -b .nose
 %build
 %{__python} setup.py build
 pushd doc
-#make man
+make man
 # HTML requires ros-theme
 make html
 popd
@@ -69,8 +68,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
@@ -82,6 +84,10 @@ sed -i 's|#!/usr/bin/env python||' $RPM_BUILD_ROOT%{python_sitelib}/rosdep2/plat
 
 
 %changelog
+* Sat Apr 12 2014 Rich Mattes <richmattes at gmail.com> - 0.10.27-1
+- Update to release 0.10.27
+- Build html documentation
+
 * Sat Feb 08 2014 Rich Mattes <richmattes at gmail.com> - 0.10.25-1
 - Update to release 0.10.25
 
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


More information about the scm-commits mailing list