From 1f0eed07e3693386830a181ff0041daadfde98ac Mon Sep 17 00:00:00 2001
From: Rich Mattes <richmattes@gmail.com>
Date: Oct 20 2015 22:26:59 +0000
Subject: Update to release 1.0.38 (rhbz#1270086)


---

diff --git a/.gitignore b/.gitignore
index 9f58bb1..c55e138 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
 /rospkg-1.0.33-bc34539.tar.gz
 /rospkg-d3c12bdfbf990b9910220642bafef16b4c830b63.tar.gz
 /rospkg-0e983634d75aeb198e8e19a66872d9a3129c7412.tar.gz
+/rospkg-11464a74624e75d12cfbba5ea6d75d4cfc3bd514.tar.gz
diff --git a/0001-Fixes-for-Python-3-dicts.patch b/0001-Fixes-for-Python-3-dicts.patch
deleted file mode 100644
index 68f748d..0000000
--- a/0001-Fixes-for-Python-3-dicts.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 8592d6dc6bde5943a7bdd4ada6dd62c8c35ce0db Mon Sep 17 00:00:00 2001
-From: Rich Mattes <richmattes@gmail.com>
-Date: Sun, 18 Oct 2015 22:29:08 -0400
-Subject: [PATCH] Fixes for Python 3 dicts
-
-The Python 3 dict does not have the has_key method, which causes the new
-FdoDetect method to fail with Python 3.  This commit replaces the
-has_key calls with a call to get() which checks for a "None" return
-value.
-
-Signed-off-by: Rich Mattes <richmattes@gmail.com>
----
- src/rospkg/os_detect.py | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/rospkg/os_detect.py b/src/rospkg/os_detect.py
-index 7b13556..541cb9b 100644
---- a/src/rospkg/os_detect.py
-+++ b/src/rospkg/os_detect.py
-@@ -150,13 +150,13 @@ class FdoDetect(OsDetector):
-     """
-     def __init__(self, fdo_id):
-         release_info = read_os_release()
--        if release_info is not None and release_info.has_key("ID") and release_info["ID"] == fdo_id:
-+        if release_info is not None and release_info.get("ID") is not None and release_info["ID"] == fdo_id:
-             self.release_info = release_info
-         else:
-             self.release_info = None
- 
-     def is_os(self):
--        return self.release_info is not None  and self.release_info.has_key("VERSION_ID")
-+        return self.release_info is not None  and self.release_info.get("VERSION_ID") is not None
- 
-     def get_version(self):
-         if self.is_os():
-@@ -165,7 +165,7 @@ class FdoDetect(OsDetector):
- 
-     def get_codename(self):
-         if self.is_os():
--            if self.release_info.has_key("VERSION"):
-+            if self.release_info.get("VERSION") is not None:
-                 version = self.release_info["VERSION"]
-                 # FDO style: works with Fedora, Debian, Suse.
-                 if version.find("(") is not -1:
--- 
-2.4.3
-
diff --git a/python-rospkg.spec b/python-rospkg.spec
index 472a272..9ea095b 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 0e983634d75aeb198e8e19a66872d9a3129c7412
+%global commit 11464a74624e75d12cfbba5ea6d75d4cfc3bd514
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global realname rospkg
 
 Name:           python-%{realname}
-Version:        1.0.37
+Version:        1.0.38
 Release:        1%{?dist}
 Summary:        Utilities for ROS package, stack, and distribution information
 
@@ -18,7 +18,6 @@ License:        BSD
 URL:            http://ros.org/wiki/rospkg
 Source0:        https://github.com/ros-infrastructure/%{realname}/archive/%{commit}/%{realname}-%{commit}.tar.gz
 
-Patch0:         0001-Fixes-for-Python-3-dicts.patch
 
 BuildArch:      noarch
 
@@ -68,7 +67,6 @@ release your code for others to use.
 
 %prep
 %setup -qn %{realname}-%{commit}
-%patch0 -p1
 
 %if 0%{?with_python3}
 rm -rf %{py3dir}
@@ -160,6 +158,9 @@ popd
 %endif
 
 %changelog
+* Tue Oct 20 2015 Rich Mattes <richmattes@gmail.com> - 1.0.38-1
+- Update to release 1.0.38 (rhbz#1270086)
+
 * Sun Oct 18 2015 Rich Mattes <richmattes@gmail.com> - 1.0.37-1
 - Update to release 1.0.37 (rhbz#1270086)
 
diff --git a/sources b/sources
index 0a8a612..911e948 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a39a298d5d0d2da530746cb8b92b664b  rospkg-0e983634d75aeb198e8e19a66872d9a3129c7412.tar.gz
+45bebd40f737535ac95ef64117d85074  rospkg-11464a74624e75d12cfbba5ea6d75d4cfc3bd514.tar.gz