From fb6b985532af1d22c4c7b3aea1ae5a9cf2dde029 Mon Sep 17 00:00:00 2001
From: Rich Mattes <richmattes@gmail.com>
Date: Sep 18 2015 01:12:51 +0000
Subject: Update to release 0.2.10 (rhbz#1250758)


- Remove upstreamed patches
- Fix spec file layout so spectool can parse it

---

diff --git a/python-catkin_pkg.spec b/python-catkin_pkg.spec
index fe9abcd..acf7836 100644
--- a/python-catkin_pkg.spec
+++ b/python-catkin_pkg.spec
@@ -1,5 +1,5 @@
 %global module_name catkin_pkg
-%global commit 4e579b06c8a4dbbd42df93800fbff54d3c7a4c26
+%global commit fa4b136b16e2d2886ab97257684f6bff243edefb
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 %if 0%{?fedora} > 12
@@ -11,7 +11,7 @@
 %endif
 
 Name:           python-%{module_name}
-Version:        0.2.9
+Version:        0.2.10
 Release:        1%{?dist}
 Summary:        Library for retrieving information about catkin packages
 
@@ -19,10 +19,6 @@ License:        BSD
 URL:            https://github.com/ros-infrastructure/%{module_name}
 BuildArch:      noarch
 Source0:        https://github.com/ros-infrastructure/%{module_name}/archive/%{commit}/%{module_name}-%{commit}.tar.gz
-# Pulled from upstream
-Patch0:         python-catkin_pkg-0.2.9-license.patch
-# Pulled from upstream
-Patch1:         python-catkin_pkg-0.2.9-use-macros-in-doc-makefile.patch
 
 Requires:       python-argparse
 Requires:       python-dateutil
@@ -38,6 +34,9 @@ BuildRequires:  python-setuptools
 BuildRequires:  python-sphinx
 %endif
 
+%description
+Library for retrieving information about catkin packages
+
 %if 0%{?with_python3}
 %package -n python3-%{module_name}
 Summary:        Library for retrieving information about catkin packages
@@ -51,12 +50,7 @@ BuildRequires:  python3-mock
 BuildRequires:  python3-nose
 BuildRequires:  python3-setuptools
 BuildRequires:  python3-sphinx
-%endif
 
-%description
-Library for retrieving information about catkin packages
-
-%if 0%{?with_python3}
 %description -n python3-%{module_name}
 Library for retrieving information about catkin packages
 %endif
@@ -65,10 +59,6 @@ Library for retrieving information about catkin packages
 %setup -qc
 
 mv %{module_name}-%{commit} python2
-pushd python2
-%patch0 -p1
-%patch1 -p1
-popd
 
 %if 0%{?with_python3}
 cp -a python2 python3
@@ -153,6 +143,11 @@ popd
 %endif
 
 %changelog
+* Thu Sep 17 2015 Rich Mattes <richmattes@gmail.com> - 0.2.10-1
+- Update to release 0.2.10 (rhbz#1250758)
+- Remove upstreamed patches
+- Fix spec file layout so spectool can parse it
+
 * Tue Jun 30 2015 Scott K Logan <logans@cottsay.net> - 0.2.9-1
 - Update to 0.2.9
 - Switch to Github upstream to get docs