[python-rosinstall/f19] Update to release 0.6.28
rmattes
rmattes at fedoraproject.org
Sun Jun 2 15:54:08 UTC 2013
commit a5f9d22706e745f7ebe2e0a13aab82909ee2af98
Author: Rich Mattes <richmattes at gmail.com>
Date: Sat Jun 1 21:04:21 2013 -0400
Update to release 0.6.28
- Fix github source url
Conflicts:
python-rosinstall.spec
.gitignore | 1 +
python-rosinstall.spec | 23 +++++++++++++++--------
sources | 2 +-
3 files changed, 17 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cd4b3b9..a0819f3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/vcstools-rosinstall-0.6.20-0-gf6c8e8a.tar.gz
/vcstools-rosinstall-0.6.22-0-g73451bf.tar.gz
/vcstools-rosinstall-0.6.26-0-g6d482b2.tar.gz
+/rosinstall-0.6.28-980042b.tar.gz
diff --git a/python-rosinstall.spec b/python-rosinstall.spec
index c8f4eb6..ff6021c 100644
--- a/python-rosinstall.spec
+++ b/python-rosinstall.spec
@@ -1,15 +1,15 @@
+%global commit 980042b01471db974c27c141f8516521cc4036f2
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global realname rosinstall
-%global gitrev 6d482b2
Name: python-rosinstall
-Version: 0.6.26
-Release: 1.20130318git%{gitrev}%{?dist}
+Version: 0.6.28
+Release: 1.20130601git%{gitrev}%{?dist}
Summary: ROS installation utilities
License: BSD
URL: http://www.ros.org/wiki/rosinstall
BuildArch: noarch
-#wget --content-disposition https://github.com/vcstools/rosinstall/tarball/0.6.26
-Source0: vcstools-%{realname}-%{version}-0-g%{gitrev}.tar.gz
+Source0: https://github.com/vcstools/%{realname}/archive/%{commit}/%{realname}-%{version}-%{shortcommit}.tar.gz
BuildRequires: python-devel
BuildRequires: python-setuptools-devel
@@ -24,8 +24,11 @@ out a working copy for you.
%prep
-%setup -q -n vcstools-%{realname}-%{gitrev}
-
+%setup -qn %{realname}-%{commit}
+%if 0%{?rhel}
+sed -i 's/haiku/default/' doc/conf.py
+sed -i 's/:special-members://g' doc/*.rst
+%endif
%build
%{__python} setup.py build
@@ -48,8 +51,12 @@ rm -rf doc/_build/html/.buildinfo
%{_mandir}/man1/%{realname}.1.gz
%changelog
-* Mon Mar 18 2013 Rich Mattes <richmattes at gmail.com> - 0.6.28-1.20130318git6d482b2
+* Sat Jun 01 2013 Rich Mattes <richmattes at gmail.com> - 0.6.28-1.20130601git980042b0
- Update to release 0.6.28
+- Fix github source url
+
+* Mon Mar 18 2013 Rich Mattes <richmattes at gmail.com> - 0.6.26-1.20130318git6d482b2
+- Update to release 0.6.26
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.22-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
diff --git a/sources b/sources
index 516ef59..f7db046 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b2f5963eb1cf719c25703752a9e678b5 vcstools-rosinstall-0.6.26-0-g6d482b2.tar.gz
+aedf7d9d6962488011465b753a3545e5 rosinstall-0.6.28-980042b.tar.gz
More information about the scm-commits
mailing list