From 5dc58d4fc5a7a1b6bfab75a1e40158e3b95fafc0 Mon Sep 17 00:00:00 2001 From: Rich Mattes Date: Aug 20 2013 02:32:24 +0000 Subject: Update to release 1.0.21 - Update to github sourceurl guidelines --- diff --git a/.gitignore b/.gitignore index 93704a8..27a3854 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /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 +/rospkg-1.0.21-f188dfb.tar.gz diff --git a/python-rospkg.spec b/python-rospkg.spec index 3f6e80a..93e0573 100644 --- a/python-rospkg.spec +++ b/python-rospkg.spec @@ -1,15 +1,15 @@ -%global gitrev 0a4448e +%global commit f188dfb6ae2e06ed43fc8f2478e20529625d9ffb +%global shortcommit %(c=%{commit}; echo ${c:0:7}) %global realname rospkg Name: python-rospkg -Version: 1.0.20 -Release: 2.20130318git%{gitrev}%{?dist} +Version: 1.0.21 +Release: 1%{?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.20 -Source0: ros-%{realname}-%{version}-0-g%{gitrev}.tar.gz +Source0: https://github.com/ros/%{realname}/archive/%{commit}/%{realname}-%{version}-%{shortcommit}.tar.gz # Remove dependency on catkin-sphinx for now Patch0: rospkg-0.1.20-catkinsphinx.patch BuildArch: noarch @@ -25,7 +25,7 @@ libraries, easily interact with those libraries from the command-line, and release your code for others to use. %prep -%setup -q -n ros-%{realname}-%{gitrev} +%setup -qn %{realname}-%{commit} %patch0 -p0 -b .catkinsphinx %build @@ -52,6 +52,10 @@ sed -i 's|#!/usr/bin/env python||' $RPM_BUILD_ROOT%{python_sitelib}/%{realname}/ %{_datadir}/%{realname} %changelog +* Mon Aug 19 2013 Rich Mattes - 1.0.21-1 +- Update to release 1.0.21 +- Update to github sourceurl guidelines + * Sun Aug 04 2013 Fedora Release Engineering - 1.0.20-2.20130318git0a4448e - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index 425b70f..718bfff 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2a1b8a6ceae3d821ae5fd4fbdddce9f3 ros-rospkg-1.0.20-0-g0a4448e.tar.gz +91e66d78a89fd72ea249d2af21a03043 rospkg-1.0.21-f188dfb.tar.gz