pool/subversion
SHA256
12
0
Fork 1
Code Issues Pull Requests Activity

Accepting request 1056713 from devel:tools:scm:svn

Browse Source 
- add ruby32-fixes.patch (https://svn.apache.org/viewvc?view=revision&revision=1904472)

OBS-URL: https://build.opensuse.org/request/show/1056713
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/subversion?expand=0&rev=190
This commit is contained in:
Dominique Leuenberger
2023-01-08 20:25:04 +00:00
committed by Git OBS Bridge
parent bb11e894cf 8f692022fd
commit 9755a38241
3 changed files with 107 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
ruby32-fixes.patch Normal file
View File

@@ -0,0 +1,99 @@
--- trunk/subversion/bindings/swig/ruby/svn/util.rb 2022/10/09 08:30:13 1904471
+++ trunk/subversion/bindings/swig/ruby/svn/util.rb 2022/10/09 12:50:28 1904472
@@ -20,7 +20,7 @@
if /cygwin|mingw|mswin32|bccwin32/.match(RUBY_PLATFORM)
$LOAD_PATH.each do |load_path|
svn_ext_path = File.join(load_path, "svn", "ext")
- if File.exists?(svn_ext_path)
+ if File.exist?(svn_ext_path)
svn_ext_path_win = File.expand_path(svn_ext_path)
svn_ext_path_win = svn_ext_path.gsub(File::SEPARATOR, File::ALT_SEPARATOR)
unless ENV["PATH"].split(";").find {|path| path == svn_ext_path_win}
--- trunk/subversion/bindings/swig/ruby/test/windows_util.rb 2022/10/09 08:30:13 1904471
+++ trunk/subversion/bindings/swig/ruby/test/windows_util.rb 2022/10/09 12:50:28 1904472
@@ -115,7 +115,7 @@
lines = []
gen_make_opts = File.join(@@top_dir, "gen-make.opts")
lines =
- File.read(gen_make_opts).lines.to_a if File.exists?(gen_make_opts)
+ File.read(gen_make_opts).lines.to_a if File.exist?(gen_make_opts)
config = Hash.new do |hash, key|
if /^--with-(.*)$/ =~ key
hash[key] = File.join(@@top_dir, $1)
--- trunk/subversion/bindings/swig/ruby/test/test_wc.rb 2015/11/17 14:20:09 1714790
+++ trunk/subversion/bindings/swig/ruby/test/test_wc.rb 2022/10/09 12:50:28 1904472
@@ -342,11 +342,11 @@
def test_adm_ensure
adm_dir = Dir.glob(File.join(@wc_path, "{.,_}svn")).first
- assert(File.exists?(adm_dir))
+ assert(File.exist?(adm_dir))
FileUtils.rm_rf(adm_dir)
- assert(!File.exists?(adm_dir))
+ assert(!File.exist?(adm_dir))
Svn::Wc.ensure_adm(@wc_path, @fs.uuid, @repos_uri, @repos_uri, 0)
- assert(File.exists?(adm_dir))
+ assert(File.exist?(adm_dir))
end
def test_merge
@@ -474,19 +474,19 @@
ctx.add(path)
ctx.ci(@wc_path).revision
- assert(File.exists?(path))
+ assert(File.exist?(path))
Svn::Wc::AdmAccess.open(nil, @wc_path, true, 5) do |access|
access.delete(path)
end
- assert(!File.exists?(path))
+ assert(!File.exist?(path))
ctx.revert(path)
- assert(File.exists?(path))
+ assert(File.exist?(path))
Svn::Wc::AdmAccess.open(nil, @wc_path, true, 5) do |access|
access.delete(path, nil, nil, true)
end
- assert(File.exists?(path))
+ assert(File.exist?(path))
end
end
@@ -808,9 +808,9 @@
ctx.add(path2)
rev2 = ctx.commit(@wc_path).revision
- assert(File.exists?(path2))
+ assert(File.exist?(path2))
assert_equal(0, ctx.up(@wc_path, 0))
- assert(!File.exists?(path2))
+ assert(!File.exist?(path2))
Svn::Wc::AdmAccess.open(nil, @wc_path) do |access|
editor = access.update_editor('', 0)
assert_equal(0, editor.target_revision)
@@ -848,9 +848,9 @@
ctx.add(path2)
rev2 = ctx.commit(@wc_path).revision
- assert(File.exists?(path2))
+ assert(File.exist?(path2))
assert_equal(0, ctx.up(@wc_path, 0))
- assert(!File.exists?(path2))
+ assert(!File.exist?(path2))
notification_count = 0
Svn::Wc::AdmAccess.open(nil, @wc_path) do |access|
notify_func = Proc.new {|n| notification_count += 1}
@@ -946,9 +946,9 @@
ctx.add(dir2_path)
rev2 = ctx.commit(@wc_path).revision
- assert(File.exists?(path1))
+ assert(File.exist?(path1))
assert_equal(rev2, ctx.switch(@wc_path, dir2_uri))
- assert(File.exists?(File.join(@wc_path, file2)))
+ assert(File.exist?(File.join(@wc_path, file2)))
Svn::Wc::AdmAccess.open_anchor(@wc_path) do |access, dir_access, target|
editor = dir_access.switch_editor('', dir1_uri, rev2)
assert_equal(rev2, editor.target_revision)

5
subversion.changes
View File

@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Jan 6 21:04:21 UTC 2023 - Dirk Müller <dmueller@suse.com>
- add ruby32-fixes.patch (https://svn.apache.org/viewvc?view=revision&revision=1904472)
-------------------------------------------------------------------
Thu Nov 17 13:45:40 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>

4
subversion.spec
View File

@@ -1,7 +1,7 @@
#
# spec file
#
# Copyright (c) 2022 SUSE LLC
# Copyright (c) 2023 SUSE LLC
# Copyright (c) 2009-2010 Pascal Bleser <pascal.bleser@opensuse.org>
#
# All modifications and additions to the file contributed by third parties
@@ -66,6 +66,7 @@ Patch11: subversion.libtool-verbose.patch
Patch20: subversion-swig-perl-install_vendor.patch
Patch23: subversion-swig-perl-Wall.patch
Patch30: subversion-1.8.0-rpath.patch
Patch31: ruby32-fixes.patch
Patch37: subversion-no-build-date.patch
Patch39: subversion-fix-parallel-build-support-for-perl-bindings.patch
Patch40: subversion-perl-underlinking.patch
@@ -250,6 +251,7 @@ parameters and keywords for the svn command and other tools.
%patch20 -p1
%patch23 -p1
%patch30 -p1
%patch31 -p1
%patch37 -p1
%patch39
%patch40 -p1