From c920d3793bbc4794c5094cd253308385ed291858 Mon Sep 17 00:00:00 2001
From: Rich Mattes <richmattes@gmail.com>
Date: Sep 17 2015 01:06:55 +0000
Subject: Update to release 0.1.10 (rhbz#1261684)


---

diff --git a/.gitignore b/.gitignore
index a29fbe5..41c3597 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /wstool-0.1.5-8b280d4.tar.gz
 /wstool-928d01b227d4e8a204765eab14541a8ca852e125.tar.gz
 /wstool-e1d99741a38aebaf63f358b68aa597d61dc87cc5.tar.gz
+/wstool-5949f2b1fe0e27f65a961769855140d3be3c6267.tar.gz
diff --git a/python-wstool.spec b/python-wstool.spec
index 928881a..f0776c8 100644
--- a/python-wstool.spec
+++ b/python-wstool.spec
@@ -1,4 +1,4 @@
-%global commit e1d99741a38aebaf63f358b68aa597d61dc87cc5
+%global commit 5949f2b1fe0e27f65a961769855140d3be3c6267
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global module_name wstool
 
@@ -10,7 +10,7 @@
 %endif
 
 Name:           python-%{module_name}
-Version:        0.1.9
+Version:        0.1.10
 Release:        1%{?dist}
 Summary:        Tool for managing a workspace of multiple heterogeneous SCM repositories
 
@@ -19,6 +19,8 @@ URL:            http://www.ros.org/wiki/%{module_name}
 Source0:        https://github.com/vcstools/%{module_name}/archive/%{commit}/%{module_name}-%{commit}.tar.gz
 # Patch to remove a duplicate installed file.  Not submitted upstream
 Patch0:         %{module_name}-0.1.9-fedora.patch
+# Patch to fix a unit test failure with subversion 1.9
+Patch1:         %{module_name}-0.1.10-svn1.9.patch
 
 BuildArch:      noarch
 
@@ -32,6 +34,7 @@ BuildRequires:  python-mock
 BuildRequires:  python-nose
 BuildRequires:  python-rosinstall
 BuildRequires:  python-setuptools
+BuildRequires:  python-sphinx
 BuildRequires:  python-vcstools >= 0.1.37
 BuildRequires:  PyYAML
 BuildRequires:  subversion
@@ -94,6 +97,7 @@ other respects, it behaves the same as rosws.
 %prep
 %setup -qn %{module_name}-%{commit}
 %patch0 -p0 -b .fedora
+%patch1 -p0 -b .svn1.9
 
 %if 0%{?with_python3}
 rm -rf %{py3dir}
@@ -157,6 +161,9 @@ popd
 %endif # with_python3
 
 %changelog
+* Wed Sep 16 2015 Rich Mattes <richmattes@gmail.com> - 0.1.10-1
+- Update to release 0.1.10 (rhbz#1261684)
+
 * Sun Sep 13 2015 Rich Mattes <richmattes@gmail.com> - 0.1.9-1
 - Update to release 0.1.9 (rhbz#1261684)
 
diff --git a/sources b/sources
index 6e307d9..fc63394 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3f25b3a840551361c9360c5054acd1e5  wstool-e1d99741a38aebaf63f358b68aa597d61dc87cc5.tar.gz
+3d4308577da004262963182734aebf31  wstool-5949f2b1fe0e27f65a961769855140d3be3c6267.tar.gz
diff --git a/wstool-0.1.10-svn1.9.patch b/wstool-0.1.10-svn1.9.patch
new file mode 100644
index 0000000..f48a934
--- /dev/null
+++ b/wstool-0.1.10-svn1.9.patch
@@ -0,0 +1,28 @@
+diff -up ./test/local/test_diff_functions_svn.py.svn1.9 ./test/local/test_diff_functions_svn.py
+--- ./test/local/test_diff_functions_svn.py.svn1.9	2015-09-16 20:48:48.601333613 -0400
++++ ./test/local/test_diff_functions_svn.py	2015-09-16 20:49:54.681944050 -0400
+@@ -36,6 +36,7 @@ import os
+ import sys
+ from test.io_wrapper import StringIO
+ import subprocess
++import re
+ 
+ import wstool
+ import wstool.helpers
+@@ -99,6 +100,7 @@ class WstoolDiffSvnTest(AbstractSCMTest)
+         modify_svn_repo(clone_path)
+ 
+     def check_diff_output(self, output):
++        output_fixed = re.sub("\(nonexistent\)", "(revision 0)", output)
+         # svn output order varies between versions
+         expected = ["""\
+ Index: clone/added.txt
+@@ -117,7 +119,7 @@ Index: clone/modified.txt
+         for snippet in expected:
+             for line in snippet.splitlines():
+                 # assertIn is not supported in Python2.6
+-                self.assertTrue(line in output, output)
++                self.assertTrue(line in output_fixed, output)
+ 
+     def test_wstool_diff_svn_outside(self):
+         """Test diff output for svn when run outside workspace"""