[python-rospkg/f19] Update to release 1.0.29

[Scott K Logan]

commit da156be99e9b185178d4ca42cba93c8d707edebe
Author: Scott K Logan <logans at cottsay.net>
Date:   Tue Jul 15 02:23:08 2014 -0500

    Update to release 1.0.29

 .gitignore                          |    1 +
 python-rospkg.spec                  |   11 +++++++++--
 rospkg-1.0.29-arm-detect-test.patch |   25 +++++++++++++++++++++++++
 sources                             |    2 +-
 4 files changed, 36 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 37ddaa7..b2ba3e9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /rospkg-1.0.26-dc49f90.tar.gz
 /rospkg-1.0.27-18f227f.tar.gz
 /rospkg-1.0.28-4cee3f4.tar.gz
+/rospkg-1.0.29-276598d.tar.gz
diff --git a/python-rospkg.spec b/python-rospkg.spec
index 655a975..62620d2 100644
--- a/python-rospkg.spec
+++ b/python-rospkg.spec
@@ -3,12 +3,12 @@
 %{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
 %endif
 
-%global commit 4cee3f4c28afea1c55f82371cb9cac91edf5de06
+%global commit 276598d2c03c07b36add2819c4f8124dfde4e55c
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global realname rospkg
 
 Name:           python-rospkg
-Version:        1.0.28
+Version:        1.0.29
 Release:        1%{?dist}
 Summary:        Utilities for ROS package, stack, and distribution information
 
@@ -18,6 +18,8 @@ Source0:        https://github.com/ros-infrastructure/%{realname}/archive/%{comm
 
 # Remove python-argparse from runtime dependency list (rhbz#1088448)
 Patch0:         %{realname}-1.0.28-argparse.patch
+# Add armv7l to the allowed arches in the arch detect test (submitted upstream)
+Patch1:         %{realname}-1.0.29-arm-detect-test.patch
 
 BuildArch:      noarch
 
@@ -45,6 +47,7 @@ release your code for others to use.
 %if 0%{?fedora} || 0%{?rhel} > 6
 %patch0 -p0 -b .argparse
 %endif
+%patch1 -p1 -b .arm-detect-test
 
 %build
 %{__python2} setup.py build
@@ -87,6 +90,10 @@ sed -i 's|#!/usr/bin/env python||' $RPM_BUILD_ROOT%{python_sitelib}/%{realname}/
 %{_datadir}/%{realname}
 
 %changelog
+* Tue Jul 15 2014 Scott K Logan <logans at cottsay.net> - 1.0.29-1
+- Update to release 1.0.29
+- Fix test failure on ARM
+
 * Wed Apr 16 2014 Rich Mattes <richmattes at gmail.com> - 1.0.28-1
 - Update to release 1.0.28
 - Remove argparse from python dependency list (rhbz#1088448)
diff --git a/rospkg-1.0.29-arm-detect-test.patch b/rospkg-1.0.29-arm-detect-test.patch
new file mode 100644
index 0000000..d6d96cc
--- /dev/null
+++ b/rospkg-1.0.29-arm-detect-test.patch
@@ -0,0 +1,25 @@
+From a000a9cdb37c9bd858498c8f4f8248514cc93c75 Mon Sep 17 00:00:00 2001
+From: Scott K Logan <logans at cottsay.net>
+Date: Tue, 15 Jul 2014 02:13:30 -0500
+Subject: [PATCH] Fix test for armv7l 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..6208d53 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', 'x86_64']
+ 
+ 
+ def test_tripwire_rhel():
+-- 
+1.9.3
+
diff --git a/sources b/sources
index 6162a1e..570d68d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9109af091e185426fee633413711e665  rospkg-1.0.28-4cee3f4.tar.gz
+e497c795cb462b298edee5be28b716ce  rospkg-1.0.29-276598d.tar.gz