From 0aff876c83dd8b7cefc94448c8eec354f0c4251d Mon Sep 17 00:00:00 2001
From: Joe Orton <jorton@redhat.com>
Date: Thu, 9 May 2013 16:37:49 +0100
Subject: [PATCH] fix spurious failures in ruby test suite (upstream r1327373)

---
 subversion-1.7.9-swighash.patch | 23 +++++++++++++++++++++++
 subversion.spec                 |  7 ++++++-
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 subversion-1.7.9-swighash.patch

diff --git a/subversion-1.7.9-swighash.patch b/subversion-1.7.9-swighash.patch
new file mode 100644
index 0000000..66ff5ec
--- /dev/null
+++ b/subversion-1.7.9-swighash.patch
@@ -0,0 +1,23 @@
+
+http://svn.apache.org/viewvc?view=revision&revision=1327373
+
+--- subversion-1.7.9/subversion/bindings/swig/ruby/test/test_wc.rb.swighash
++++ subversion-1.7.9/subversion/bindings/swig/ruby/test/test_wc.rb
+@@ -326,12 +326,16 @@ class SvnWcTest < Test::Unit::TestCase
+         ignored_errors = []
+         callbacks.ignored_errors = ignored_errors
+         access.walk_entries(@wc_path, callbacks)
++        sorted_ignored_errors = ignored_errors.sort_by {|path, err| path}
++        sorted_ignored_errors = sorted_ignored_errors.collect! do |path, err| 
++          [path, err.class]
++        end
+         assert_equal([
+                       [@wc_path, Svn::Error::Cancelled],
+                       [path1, Svn::Error::Cancelled],
+                       [path2, Svn::Error::Cancelled],
+                      ],
+-                     ignored_errors.collect {|path, err| [path, err.class]})
++                     sorted_ignored_errors)
+       end
+     end
+   end
diff --git a/subversion.spec b/subversion.spec
index 51ce4e3..aa159c0 100644
--- a/subversion.spec
+++ b/subversion.spec
@@ -26,7 +26,7 @@
 Summary: A Modern Concurrent Version Control System
 Name: subversion
 Version: 1.7.9
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: ASL 2.0
 Group: Development/Tools
 URL: http://subversion.apache.org/
@@ -45,6 +45,7 @@ Patch4: subversion-1.7.2-ruby19.patch
 Patch7: subversion-1.7.4-kwallet2.patch
 Patch8: subversion-1.7.4-sqlitever.patch
 Patch9: subversion-1.7.9-rubybind.patch
+Patch10: subversion-1.7.9-swighash.patch
 BuildRequires: autoconf, libtool, python, python-devel, texinfo, which
 BuildRequires: %{dbdevel} >= 4.1.25, swig >= 1.3.24, gettext
 BuildRequires: apr-devel >= 1.3.0, apr-util-devel >= 1.3.0
@@ -183,6 +184,7 @@ This package includes supplementary tools for use with Subversion.
 %patch7 -p1 -b .kwallet2
 %patch8 -p1 -b .sqlitever
 %patch9 -p1 -b .rubybind
+%patch10 -p1 -b .swighash
 
 %build
 # Regenerate the buildsystem, so that:
@@ -469,6 +471,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* Thu May  9 2013 Joe Orton <jorton@redhat.com> - 1.7.9-3
+- fix spurious failures in ruby test suite (upstream r1327373)
+
 * Thu May  9 2013 Joe Orton <jorton@redhat.com> - 1.7.9-2
 - try harder to avoid svnserve bind failures in ruby binding tests
 - enable verbose output for ruby binding tests