diff --git a/.gitignore b/.gitignore index d848fdf..1b6e822 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /rospkg-1.0.28-4cee3f4.tar.gz /rospkg-1.0.29-276598d.tar.gz /rospkg-1.0.31-ee467fa.tar.gz +/rospkg-1.0.33-bc34539.tar.gz diff --git a/python-rospkg.spec b/python-rospkg.spec index 1d0033f..e9e1665 100644 --- a/python-rospkg.spec +++ b/python-rospkg.spec @@ -5,12 +5,12 @@ %{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())")} %endif -%global commit ee467fa505d04850ebc992d48b5374fb8b054446 +%global commit bc345392596d71177afbc16d0d10b8cb572cd901 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global realname rospkg Name: python-%{realname} -Version: 1.0.31 +Version: 1.0.33 Release: 1%{?dist} Summary: Utilities for ROS package, stack, and distribution information @@ -18,9 +18,6 @@ License: BSD URL: http://ros.org/wiki/rospkg Source0: https://github.com/ros-infrastructure/%{realname}/archive/%{commit}/%{realname}-%{version}-%{shortcommit}.tar.gz -# Add armv7l/ppc/ppc64 to the allowed arches in the arch detect test (submitted upstream) -Patch0: %{realname}-1.0.31-arch-detect-test.patch - BuildArch: noarch BuildRequires: python2-devel @@ -71,7 +68,6 @@ release your code for others to use. %prep %setup -qn %{realname}-%{commit} -%patch0 -p1 -b .arch-detect-test %if 0%{?with_python3} rm -rf %{py3dir} @@ -163,6 +159,10 @@ popd %endif %changelog +* Tue Dec 30 2014 Rich Mattes - 1.0.33-1 +- Update to release 1.0.33 +- Remove upstreamed patch + * Sat Oct 25 2014 Scott K Logan - 1.0.31-1 - Update to release 1.0.31 - Fix test failure on PPC diff --git a/rospkg-1.0.31-arch-detect-test.patch b/rospkg-1.0.31-arch-detect-test.patch deleted file mode 100644 index 55ca442..0000000 --- a/rospkg-1.0.31-arch-detect-test.patch +++ /dev/null @@ -1,22 +0,0 @@ -From c91a497e2fb13eb575c518c3763d47481e5fa072 Mon Sep 17 00:00:00 2001 -From: Scott K Logan -Date: Tue, 15 Jul 2014 02:13:30 -0500 -Subject: [PATCH] Fix test for armv7l and ppc[64] machines - ---- - test/test_rospkg_os_detect.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/test/test_rospkg_os_detect.py b/test/test_rospkg_os_detect.py -index ea1b8b3..7b2c766 100644 ---- a/test/test_rospkg_os_detect.py -+++ b/test/test_rospkg_os_detect.py -@@ -349,7 +349,7 @@ def test_OsDetector(): - def test_tripwire_uname_get_machine(): - from rospkg.os_detect import uname_get_machine - retval = uname_get_machine() -- assert retval in [None, 'i386', 'i686', 'x86_64'] -+ assert retval in [None, 'armv7l', 'i386', 'i686', 'ppc', 'ppc64', 'x86_64'] - - - def test_tripwire_rhel(): diff --git a/sources b/sources index 41c26ff..26bc5ec 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d7e0313efab1a16f447c38c12983d52b rospkg-1.0.31-ee467fa.tar.gz +10f8abb1f2ed80e519ffb0e46d130670 rospkg-1.0.33-bc34539.tar.gz