[python-rosdistro/f20] Update to release 0.3.5

[Scott K Logan]

commit 0a68dd2118d9fae5efa9a9bba5e016b6dd79dd5e
Author: Scott K Logan <logans at cottsay.net>
Date:   Sun Apr 27 19:19:34 2014 -0600

    Update to release 0.3.5

 .gitignore                       |    1 +
 python-rosdistro.spec            |   24 ++++++++++++++++++------
 rosdistro-0.3.4-setuptools.patch |   12 ------------
 rosdistro-0.3.5-argparse.patch   |   11 +++++++++++
 sources                          |    1 +
 5 files changed, 31 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 543c26d..c1a3f85 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /rosdistro-0.2.8-6e83551.tar.gz
 /rosdistro-0.3.4-dce80f7.tar.gz
+/rosdistro-0.3.5-1eb929b.tar.gz
diff --git a/python-rosdistro.spec b/python-rosdistro.spec
index c8eb447..73b6563 100644
--- a/python-rosdistro.spec
+++ b/python-rosdistro.spec
@@ -1,22 +1,28 @@
-%global commit dce80f72ae9c6a7372b798f354068de5496f66e2
+%global commit 1eb929bb2f715bd6cabf49bad165a31da5f5a589
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global realname rosdistro
 
 Name:           python-rosdistro
-Version:        0.3.4
-Release:        2%{?dist}
+Version:        0.3.5
+Release:        1%{?dist}
 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
-Patch0:         %{realname}-0.3.4-setuptools.patch
+Patch0:         %{realname}-0.3.5-argparse.patch
 
 BuildArch:      noarch
+
 BuildRequires:  PyYAML
+BuildRequires:  git
 BuildRequires:  python2-devel
 BuildRequires:  python-catkin-sphinx
-BuildRequires:  git
+Requires:       PyYAML
+Requires:       python-argparse
+Requires:       python-catkin_pkg
+Requires:       python-rospkg
+Requires:       python-setuptools
 
 %description
 The rosdistro tool allows you to get access to the full dependency tree and 
@@ -33,7 +39,7 @@ local cache file, to speed up performance for the next query.
 
 %prep
 %setup -qn %{realname}-%{commit}
-%patch0 -p0
+%patch0 -p1
 sed -i 's|#!/usr/bin/env python||' src/rosdistro/external/appdirs.py
 
 %build
@@ -56,6 +62,12 @@ rm -f doc/_build/html/.buildinfo
 %{python_sitelib}/%{realname}-%{version}-py?.?.egg-info
 
 %changelog
+* Sun Apr 27 2014 Scott K Logan <logans at cottsay.net> - 0.3.5-1
+- Update to release 0.3.5
+- Remove argparse from python dependency list
+- Added missing install requirements
+- Remove patch for setuptools (merged upstream)
+
 * Tue Apr 08 2014 Rich Mattes <richmattes at gmail.com> - 0.3.4-2
 - Depend on setuptools instead of distribute
 
diff --git a/rosdistro-0.3.5-argparse.patch b/rosdistro-0.3.5-argparse.patch
new file mode 100644
index 0000000..ba21f43
--- /dev/null
+++ b/rosdistro-0.3.5-argparse.patch
@@ -0,0 +1,11 @@
+--- a/setup.py	2014-04-18 17:38:07.000000000 -0600
++++ b/setup.py	2014-04-27 18:13:12.468820716 -0600
+@@ -8,7 +8,7 @@
+ setup(
+     name='rosdistro',
+     version=__version__,
+-    install_requires=['argparse', 'catkin_pkg', 'rospkg', 'PyYAML', 'setuptools'],
++    install_requires=['catkin_pkg', 'rospkg', 'PyYAML', 'setuptools'],
+     packages=find_packages('src'),
+     package_dir={'': 'src'},
+     scripts=[
diff --git a/sources b/sources
index c18a410..ba4af42 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 99c7220781a179d12902675513df9222  rosdistro-0.3.4-dce80f7.tar.gz
+9c43baf3df83bfabf9e3b0436f4f2ee7  rosdistro-0.3.5-1eb929b.tar.gz