[python-rosdistro/f19] Depend on setuptools instead of distribute
rmattes
rmattes at fedoraproject.org
Wed Apr 9 00:11:21 UTC 2014
commit eb02d0442ce3a96b9fdbf5cc4b3141a8ee93f1ae
Author: Rich Mattes <richmattes at gmail.com>
Date: Tue Apr 8 19:55:58 2014 -0400
Depend on setuptools instead of distribute
python-rosdistro.spec | 7 ++++++-
rosdistro-0.3.4-setuptools.patch | 12 ++++++++++++
2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/python-rosdistro.spec b/python-rosdistro.spec
index 72202ad..c8eb447 100644
--- a/python-rosdistro.spec
+++ b/python-rosdistro.spec
@@ -4,12 +4,13 @@
Name: python-rosdistro
Version: 0.3.4
-Release: 1%{?dist}
+Release: 2%{?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
BuildArch: noarch
BuildRequires: PyYAML
@@ -32,6 +33,7 @@ local cache file, to speed up performance for the next query.
%prep
%setup -qn %{realname}-%{commit}
+%patch0 -p0
sed -i 's|#!/usr/bin/env python||' src/rosdistro/external/appdirs.py
%build
@@ -54,6 +56,9 @@ rm -f doc/_build/html/.buildinfo
%{python_sitelib}/%{realname}-%{version}-py?.?.egg-info
%changelog
+* Tue Apr 08 2014 Rich Mattes <richmattes at gmail.com> - 0.3.4-2
+- Depend on setuptools instead of distribute
+
* Sat Feb 08 2014 Rich Mattes <richmattes at gmail.com> - 0.3.4-1
- Update to release 0.3.4
diff --git a/rosdistro-0.3.4-setuptools.patch b/rosdistro-0.3.4-setuptools.patch
new file mode 100644
index 0000000..f8d4468
--- /dev/null
+++ b/rosdistro-0.3.4-setuptools.patch
@@ -0,0 +1,12 @@
+diff -up ./setup.py.setuptools ./setup.py
+--- ./setup.py.setuptools 2014-04-08 19:52:15.644204990 -0400
++++ ./setup.py 2014-04-08 19:52:32.050809073 -0400
+@@ -8,7 +8,7 @@ exec(open(os.path.join(os.path.dirname(_
+ setup(
+ name='rosdistro',
+ version=__version__,
+- install_requires=['argparse', 'catkin_pkg', 'distribute', 'rospkg', 'PyYAML'],
++ install_requires=['argparse', 'catkin_pkg', 'setuptools', 'rospkg', 'PyYAML'],
+ packages=find_packages('src'),
+ package_dir={'': 'src'},
+ scripts=[
More information about the scm-commits
mailing list