Accepting request 34322 from devel:tools:scm:svn

Copy from devel:tools:scm:svn/subversion based on submit request 34322 from user coolo

OBS-URL: https://build.opensuse.org/request/show/34322
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/subversion?expand=0&rev=63

subversion-1.6.6.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fe23c1a247dea631048bd62fd1cd6111924be2896ef2d166245ac9a1284c3c92
-size 5513036

subversion-1.6.9.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:05526f92fcb612bdc3bab0d5e218e25847bf10846e047ce244e33859b205111c
+size 5478554

subversion-ruby-bindings-test.patch

@@ -1,16 +0,0 @@
-Index: subversion/bindings/swig/ruby/test/test_core.rb
-===================================================================
---- subversion/bindings/swig/ruby/test/test_core.rb	(revision 40087)
-+++ subversion/bindings/swig/ruby/test/test_core.rb	(revision 40088)
-@@ -628,9 +628,8 @@
-     assert_raises(Svn::Error::BadFilename) do
-       Svn::Core::MimeType.detect(nonexistent_html_file)
-     end
--    assert_raises(Svn::Error::BadFilename) do
--      Svn::Core::MimeType.detect(nonexistent_html_file, type_map)
--    end
-+    assert_equal("text/html",
-+                 Svn::Core::MimeType.detect(nonexistent_html_file, type_map))
- 
-     empty_html_file = File.join(@tmp_path, "empty.html")
-     FileUtils.touch(empty_html_file)

subversion.changes

@@ -1,3 +1,31 @@
+-------------------------------------------------------------------
+Sun Jan 24 00:43:33 UTC 2010 - pascal.bleser@opensuse.org
+
+- update to 1.6.9:
+User-visible changes:
+  * allow multiple external updates over ra_svn (issue #3487)
+  * fix a segmentation fault when using FSFS (r881905)
+  * support Berkeley DB 4.8 (r879688)
+  * various autoprop improvements (r880274, -5)
+  * improve usage of svn+ssh:// on Windows (issue #2580)
+  * teach 1.6.x to recognize 1.7 working copies (1.6.x-future-
+    proof branch)
+  * update help text for 'svn update' and 'svn switch' (r886164)
+  * make 'svnadmin load --parent-dir' create valid mergeinfo
+    (r888979)
+  * tolerate relative merge source paths in mergeinfo (r889840)
+  * teach mod_dav_svn to support the Label header (issue #3519)
+  * fixed: svnsync leaves stale sync-locks on mirrors (r884842)
+  * fix applicability of 'svn resolve --accept=theirs-conflict'
+    (r880525)
+  * fixed: segfault in 'svn resolve' (r896522)
+  * fix commit failure against an out-of-date mirror (r900797)
+
+Developer-visible changes:
+  * update ruby bindings test expectation (r880162)
+  * don't allow rangelist and mergeinfo API to modify input args
+    (r879093)
+
 -------------------------------------------------------------------
 Mon Jan  4 13:12:51 CET 2010 - vuntz@opensuse.org
 

subversion.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package subversion (Version 1.6.6)
+# spec file for package subversion (Version 1.6.9)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # Copyright (c) 2009 Pascal Bleser <pascal.bleser@opensuse.org>
@@ -41,8 +41,8 @@
 %endif # suse_version > 1030
 
 Name:           subversion
-Version:        1.6.6
-Release:        2
+Version:        1.6.9
+Release:        1
 # in-tree SWIG version to use for the build:
 %define swig_version   1.3.36
 %define sqlite_version 3.6.17
@@ -158,7 +158,6 @@ Patch31:        subversion.perl.LD_RUN_PATH.patch
 Patch33:        subversion.header_wrappers.patch
 Patch35:        subversion.java14.patch
 Patch36:        subversion-ctypes-remove_shebang.patch
-Patch38:        subversion-ruby-bindings-test.patch
 #
 %if %with_ruby
 %if %{!?rb_arch:1}0
@@ -252,6 +251,7 @@ Provides Python (SWIG) support for Subversion.
 
 %package python-ctypes
 
+
 Group:          Development/Tools/Version Control
 Summary:        High-Level Python Bindings for Subversion
 Requires:       subversion = %{version}
@@ -342,7 +342,6 @@ popd #./sqlite-amalgamation
 %patch33 -p1
 %patch35 -p1
 %patch36 -p0
-%patch38 -p0
 %if 0%{?sles_version} == 9
 %__grep -rwl '/usr/bin/python' . | xargs %__sed -i 's|/usr/bin/python|%{_usr}/bin/python2.5|g'
 %__grep -rwl '/usr/bin/env python' . | xargs %__sed -i 's|/usr/bin/env python|%{_usr}/bin/python2.5|g'