From 1e0ba091e91e7929f28ad707ba4c127198e8adb8 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= <arekm@maven.pl>
Date: Thu, 13 Jun 2013 21:56:52 +0200
Subject: [PATCH] - up to 1.8.0 (almost final, so rel 0.1 for now); serf
 instead of (dropped upstream) neon; BDB support deprecated (but still
 available in 1.8 series)

---
 subversion-1.7.2-ruby19.patch | 365 ----------------------------------
 subversion-DESTDIR.patch      |  26 +--
 subversion.spec               |  62 ++----
 3 files changed, 30 insertions(+), 423 deletions(-)
 delete mode 100644 subversion-1.7.2-ruby19.patch

diff --git a/subversion-1.7.2-ruby19.patch b/subversion-1.7.2-ruby19.patch
deleted file mode 100644
index 794c663..0000000
--- a/subversion-1.7.2-ruby19.patch
+++ /dev/null
@@ -1,365 +0,0 @@
-Date: Tue, 20 Dec 2011 21:08:00 -0800
-From: Vincent Batts <vbatts@slackware.com>
-Subject: Re: [PATCH] enabling ruby in the subversion build
-Message-ID: <20111221050800.GA17350@slackware.com>
-
---- subversion-1.7.2/configure.ac.ruby19
-+++ subversion-1.7.2/configure.ac
-@@ -1130,13 +1130,6 @@ if test "$RUBY" != "none"; then
- 
-     AC_SUBST(RUBY_MAJOR)
-     AC_SUBST(RUBY_MINOR)
--    if test ! \( "$RUBY_MAJOR" -eq "1" -a "$RUBY_MINOR" -eq "8" \); then
--      # Disallow Ruby 1.9 or later until the binding tests get fixed
--      # to run with those versions.
--      RUBY="none"
--      AC_MSG_WARN([The detected Ruby is too new for Subversion to use])
--      AC_MSG_WARN([Only 1.8.x releases are supported at this time])
--    fi
-   else
-     AC_MSG_RESULT([no])
-     RUBY="none"
---- subversion-1.7.2/Makefile.in.ruby19
-+++ subversion-1.7.2/Makefile.in
-@@ -318,7 +318,7 @@ INSTALL_EXTRA_SWIG_RB=\
-     $(INSTALL_DATA) "$$i" $(DESTDIR)$(SWIG_RB_SITE_LIB_DIR)/svn; \
-   done
- 
--APXS = @APXS@ 
-+APXS = @APXS@
- 
- PYTHON = @PYTHON@
- PERL = @PERL@
-@@ -818,9 +818,14 @@ swig-rb: autogen-swig-rb
- 
- check-swig-rb: swig-rb svnserve
- 	cd $(SWIG_RB_DIR); \
--	  $(RUBY) -I $(SWIG_RB_SRC_DIR) \
--	    $(SWIG_RB_SRC_DIR)/test/run-test.rb \
--	    --verbose=$(SWIG_RB_TEST_VERBOSE)
-+	  if [ "$(RUBY_MAJOR)" -eq 1 -a "$(RUBY_MINOR)" -lt 9 ] ; then \
-+	    $(RUBY) -I $(SWIG_RB_SRC_DIR) \
-+	      $(SWIG_RB_SRC_DIR)/test/run-test.rb \
-+	      --verbose=$(SWIG_RB_TEST_VERBOSE); \
-+	  else \
-+	    $(RUBY) -I $(SWIG_RB_SRC_DIR) \
-+	      $(SWIG_RB_SRC_DIR)/test/run-test.rb; \
-+	  fi
- 
- EXTRACLEAN_SWIG_RB=rm -f $(SWIG_RB_SRC_DIR)/svn_*.c $(SWIG_RB_SRC_DIR)/core.c
- 
---- subversion-1.7.2/subversion/bindings/swig/ruby/svn/info.rb.ruby19
-+++ subversion-1.7.2/subversion/bindings/swig/ruby/svn/info.rb
-@@ -229,7 +229,9 @@ module Svn
- 
-     def parse_diff_unified(entry)
-       in_content = false
--      entry.body.each do |line|
-+      # accomodation for ruby 1.9 and 1.8
-+      each_meth = entry.body.respond_to?(:each_line) ? :each_line : :each
-+      entry.body.send(each_meth) do |line|
-         case line
-         when /^@@/
-           in_content = true
---- subversion-1.7.2/subversion/bindings/swig/ruby/svn/util.rb.ruby19
-+++ subversion-1.7.2/subversion/bindings/swig/ruby/svn/util.rb
-@@ -36,7 +36,7 @@ module Svn
-   module Util #:nodoc:
-     module_function
-     def to_ruby_class_name(name)
--      name.split("_").collect do |x|
-+      name.to_s.split("_").collect do |x|
-         "#{x[0,1].upcase}#{x[1..-1].downcase}"
-       end.join("")
-     end
---- subversion-1.7.2/subversion/bindings/swig/ruby/test/my-assertions.rb.ruby19
-+++ subversion-1.7.2/subversion/bindings/swig/ruby/test/my-assertions.rb
-@@ -24,20 +24,33 @@ module Test
-   module Unit
-     module Assertions
- 
-+      # make an intermediary assertion block handler
-+      def _my_assert_block(&block)
-+	if RUBY_VERSION > '1.9'
-+	  assert_block do
-+	    yield
-+	  end
-+	else
-+	  _wrap_assertion do
-+	    yield
-+	  end
-+	end
-+      end
-+
-       def assert_true(boolean, message=nil)
--        _wrap_assertion do
-+        _my_assert_block do
-           assert_equal(true, boolean, message)
-         end
-       end
- 
-       def assert_false(boolean, message=nil)
--        _wrap_assertion do
-+        _my_assert_block do
-           assert_equal(false, boolean, message)
-         end
-       end
- 
-       def assert_nested_sorted_array(expected, actual, message=nil)
--        _wrap_assertion do
-+        _my_assert_block do
-           assert_equal(expected.collect {|elem| elem.sort},
-                        actual.collect {|elem| elem.sort},
-                        message)
-@@ -45,7 +58,7 @@ module Test
-       end
- 
-       def assert_equal_log_entries(expected, actual, message=nil)
--        _wrap_assertion do
-+        _my_assert_block do
-           actual = actual.collect do |entry|
-             changed_paths = entry.changed_paths
-             changed_paths.each_key do |path|
---- subversion-1.7.2/subversion/bindings/swig/ruby/test/test_client.rb.ruby19
-+++ subversion-1.7.2/subversion/bindings/swig/ruby/test/test_client.rb
-@@ -2203,7 +2203,11 @@ class SvnClientTest < Test::Unit::TestCa
- 
-     make_context(log) do |ctx|
-       items = nil
--      ctx.set_log_msg_func do |items|
-+      ctx.set_log_msg_func do |l_items|
-+	# ruby 1.8 magically carried the assignment of 'items' back from this Proc block, 
-+        # but in 1.9, we need to have names that don't conflict, and set the outside 'items'.
-+        # This works in 1.8 as well
-+        items = l_items
-         [true, log]
-       end
- 
---- subversion-1.7.2/subversion/bindings/swig/ruby/test/test_core.rb.ruby19
-+++ subversion-1.7.2/subversion/bindings/swig/ruby/test/test_core.rb
-@@ -1,3 +1,4 @@
-+# encoding: UTF-8
- # ====================================================================
- #    Licensed to the Apache Software Foundation (ASF) under one
- #    or more contributor license agreements.  See the NOTICE file
-@@ -52,7 +53,13 @@ class SvnCoreTest < Test::Unit::TestCase
-     now = Time.now.gmtime
-     str = now.strftime("%Y-%m-%dT%H:%M:%S.") + "#{now.usec}Z"
- 
--    assert_equal(now, Time.from_svn_format(str))
-+    if RUBY_VERSION > '1.9'
-+      # ruby 1.9 Time comparison gets into the nano-seconds, that strftime
-+      # shaves off. So we can compare epoch time instead
-+      assert_equal(now.to_i, Time.from_svn_format(str).gmtime.to_i)
-+    else
-+      assert_equal(now, Time.from_svn_format(str).gmtime)
-+    end
- 
-     apr_time = now.to_i * 1000000 + now.usec
-     assert_equal(apr_time, now.to_apr_time)
-@@ -244,7 +251,11 @@ class SvnCoreTest < Test::Unit::TestCase
-       config_infos << [section, name, value]
-     end
-     assert_equal(infos.sort, config_infos.sort)
--    assert_equal(infos.sort, config.collect {|args| args}.sort)
-+    if RUBY_VERSION > '1.9'
-+      assert_equal(infos.sort, config.collect {|sect,name,val| [sect,name,val]}.sort)
-+    else
-+      assert_equal(infos.sort, config.collect {|args| args}.sort)
-+    end
-   end
- 
-   def test_config_find_group
-@@ -532,7 +543,13 @@ EOD
-     date_str = now.strftime("%Y-%m-%dT%H:%M:%S")
-     date_str << ".#{now.usec}Z"
-     info.date = date_str
--    assert_equal(now, info.date)
-+    if RUBY_VERSION > '1.9'
-+      # ruby 1.9 Time comparison gets into the nano-seconds, that strftime
-+      # shaves off. So we can compare epoch time instead
-+      assert_equal(now.to_i, info.date.gmtime.to_i)
-+    else
-+      assert_equal(now, info.date.gmtime)
-+    end
-   end
- 
-   def test_svn_prop
---- subversion-1.7.2/subversion/bindings/swig/ruby/test/test_delta.rb.ruby19
-+++ subversion-1.7.2/subversion/bindings/swig/ruby/test/test_delta.rb
-@@ -17,9 +17,10 @@
- #    under the License.
- # ====================================================================
- 
-+require "my-assertions"
- require "util"
- require "stringio"
--require 'md5'
-+require 'digest/md5'
- require 'tempfile'
- 
- require "svn/info"
-@@ -46,8 +47,8 @@ class SvnDeltaTest < Test::Unit::TestCas
-     target = StringIO.new(t)
-     stream = Svn::Delta::TextDeltaStream.new(source, target)
-     assert_nil(stream.md5_digest)
--    _wrap_assertion do
--      stream.each do |window|
-+    _my_assert_block do
-+      ret = stream.each do |window|
-         window.ops.each do |op|
-           op_size = op.offset + op.length
-           case op.action_code
-@@ -62,8 +63,9 @@ class SvnDeltaTest < Test::Unit::TestCas
-           end
-         end
-       end
-+      true if RUBY_VERSION > '1.9' # this block returns nil in > ruby '1.9'
-     end
--    assert_equal(MD5.new(t).hexdigest, stream.md5_digest)
-+    assert_equal(Digest::MD5.hexdigest(t), stream.md5_digest)
-   end
- 
-   def test_txdelta_window_compose
-@@ -81,7 +83,7 @@ class SvnDeltaTest < Test::Unit::TestCas
-       end
-     end
- 
--    _wrap_assertion do
-+    assert_block do
-       composed_window.ops.each do |op|
-         op_size = op.offset + op.length
-         case op.action_code
-@@ -169,6 +171,7 @@
-     stream = Svn::Delta::TextDeltaStream.new(source, target)
- 
-     output = StringIO.new("")
-+    output.set_encoding Encoding::ASCII_8BIT if output.respond_to? :set_encoding
-     handler = Svn::Delta.svndiff_handler(output)
- 
-     Svn::Delta.send(target_text, handler)
---- subversion-1.7.2/subversion/bindings/swig/ruby/test/test_fs.rb.ruby19
-+++ subversion-1.7.2/subversion/bindings/swig/ruby/test/test_fs.rb
-@@ -20,7 +20,7 @@
- require "my-assertions"
- require "util"
- require "time"
--require "md5"
-+require "digest/md5"
- 
- require "svn/core"
- require "svn/fs"
-@@ -49,14 +49,15 @@ class SvnFsTest < Test::Unit::TestCase
- 
-     assert(!File.exist?(path))
-     fs = nil
--    callback = Proc.new do |fs|
-+    callback = Proc.new do |t_fs|
-       assert(File.exist?(path))
-       assert_equal(fs_type, Svn::Fs.type(path))
--      fs.set_warning_func do |err|
-+      t_fs.set_warning_func do |err|
-         p err
-         abort
-       end
--      assert_equal(path, fs.path)
-+      assert_equal(path, t_fs.path)
-+      fs = t_fs
-     end
-     yield(:create, [path, config], callback)
- 
-@@ -162,7 +163,7 @@ class SvnFsTest < Test::Unit::TestCase
- 
-       assert_equal(src, @fs.root.file_contents(path_in_repos){|f| f.read})
-       assert_equal(src.length, @fs.root.file_length(path_in_repos))
--      assert_equal(MD5.new(src).hexdigest,
-+      assert_equal(Digest::MD5.hexdigest(src),
-                    @fs.root.file_md5_checksum(path_in_repos))
- 
-       assert_equal([path_in_repos], @fs.root.paths_changed.keys)
-@@ -364,7 +365,7 @@ class SvnFsTest < Test::Unit::TestCase
- 
-       File.open(path, "w") {|f| f.print(modified)}
-       @fs.transaction do |txn|
--        checksum = MD5.new(normalize_line_break(result)).hexdigest
-+        checksum = Digest::MD5.hexdigest(normalize_line_break(result))
-         stream = txn.root.apply_text(path_in_repos, checksum)
-         stream.write(normalize_line_break(result))
-         stream.close
-@@ -392,8 +393,8 @@ class SvnFsTest < Test::Unit::TestCase
- 
-       File.open(path, "w") {|f| f.print(modified)}
-       @fs.transaction do |txn|
--        base_checksum = MD5.new(normalize_line_break(src)).hexdigest
--        checksum = MD5.new(normalize_line_break(result)).hexdigest
-+        base_checksum = Digest::MD5.hexdigest(normalize_line_break(src))
-+        checksum = Digest::MD5.hexdigest(normalize_line_break(result))
-         handler = txn.root.apply_textdelta(path_in_repos,
-                                            base_checksum, checksum)
-         assert_raises(Svn::Error::ChecksumMismatch) do
---- subversion-1.7.2/subversion/bindings/swig/ruby/test/test_repos.rb.ruby19
-+++ subversion-1.7.2/subversion/bindings/swig/ruby/test/test_repos.rb
-@@ -98,11 +98,12 @@ class SvnReposTest < Test::Unit::TestCas
-     fs_type = Svn::Fs::TYPE_FSFS
-     fs_config = {Svn::Fs::CONFIG_FS_TYPE => fs_type}
-     repos = nil
--    Svn::Repos.create(tmp_repos_path, {}, fs_config) do |repos|
-+    Svn::Repos.create(tmp_repos_path, {}, fs_config) do |t_repos|
-       assert(File.exist?(tmp_repos_path))
--      fs_type_path = File.join(repos.fs.path, Svn::Fs::CONFIG_FS_TYPE)
-+      fs_type_path = File.join(t_repos.fs.path, Svn::Fs::CONFIG_FS_TYPE)
-       assert_equal(fs_type, File.open(fs_type_path) {|f| f.read.chop})
--      repos.fs.set_warning_func(&warning_func)
-+      t_repos.fs.set_warning_func(&warning_func)
-+      repos = t_repos
-     end
- 
-     assert(repos.closed?)
---- subversion-1.7.2/subversion/bindings/swig/ruby/test/test-unit-ext/priority.rb.ruby19
-+++ subversion-1.7.2/subversion/bindings/swig/ruby/test/test-unit-ext/priority.rb
-@@ -179,7 +179,7 @@ module Test
-         apply_priority
-         !@tests.empty?
-       end
--    end
-+    end if RUBY_VERSION < '1.9.3'
- 
-     class AutoRunner
-       alias_method :original_options, :options
---- subversion-1.7.2/subversion/bindings/swig/ruby/test/test-unit-ext.rb.ruby19
-+++ subversion-1.7.2/subversion/bindings/swig/ruby/test/test-unit-ext.rb
-@@ -17,7 +17,7 @@
- #    under the License.
- # ====================================================================
- 
--require "test-unit-ext/always-show-result"
-+require "test-unit-ext/always-show-result" if RUBY_VERSION < '1.9.3'
- require "test-unit-ext/priority"
--require "test-unit-ext/backtrace-filter"
--require "test-unit-ext/long-display-for-emacs"
-+require "test-unit-ext/backtrace-filter" if RUBY_VERSION < '1.9.3'
-+require "test-unit-ext/long-display-for-emacs" if RUBY_VERSION < '1.9.3'
---- subversion-1.7.2/subversion/bindings/swig/ruby/test/test_wc.rb.ruby19
-+++ subversion-1.7.2/subversion/bindings/swig/ruby/test/test_wc.rb
-@@ -530,7 +530,7 @@ EOE
-       ctx.ci(lf_path)
- 
-       Svn::Wc::AdmAccess.open(nil, @wc_path, true, 5) do |access|
--        _wrap_assertion do
-+        _my_assert_block do
-           File.open(src_path, "wb") {|f| f.print(source)}
-           args = [method_name, src_path, crlf_path, Svn::Wc::TRANSLATE_FROM_NF]
-           result = yield(access.send(*args), source)
-@@ -1084,7 +1084,11 @@ EOE
-         assert_not_nil context
-         assert_kind_of Svn::Wc::Context, context
-       end
--      assert_nil result;
-+      if RUBY_VERSION > '1.9'
-+        assert_equal(result,true)
-+      else
-+        assert_nil result
-+      end
-     end
-   end
- 
diff --git a/subversion-DESTDIR.patch b/subversion-DESTDIR.patch
index 876c159..c6c16d9 100644
--- a/subversion-DESTDIR.patch
+++ b/subversion-DESTDIR.patch
@@ -18,22 +18,14 @@
  INSTALL_DATA = $(INSTALL) -m 644
  INSTALL_LOCALE = $(INSTALL_DATA)
  
---- subversion-1.7.0-rc3/build/generator/templates/makefile.ezt~	2011-04-27 23:54:33.000000000 +0200
-+++ subversion-1.7.0-rc3/build/generator/templates/makefile.ezt	2011-09-16 08:46:27.559338812 +0200
-@@ -125,13 +125,13 @@
+--- subversion-1.7.0-rc3/build/generator/templates/build-outputs.mk.ezt~	2011-04-27 23:54:33.000000000 +0200
++++ subversion-1.7.0-rc3/build/generator/templates/build-outputs.mk.ezt	2011-09-16 08:46:27.559338812 +0200
+@@ -128,7 +128,7 @@
  ########################################
  [for areas]
- [is areas.type "apache-mod"]install-mods-shared:[for areas.files] [areas.files.fullname][end][for areas.files]
--	cd [areas.files.dirname] ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n [areas.files.name] [areas.files.filename][end]
-+	cd [areas.files.dirname] ; $(MKDIR) "$(DESTDIR)$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n [areas.files.name] [areas.files.filename][end]
- [else]install-[areas.type]: [for areas.files][if-index areas.files first][else] [end][areas.files.fullname][end] [for areas.apache_files] [areas.apache_files.fullname][end]
- 	$(MKDIR) $(DESTDIR)$([areas.varname]dir)[for areas.files][is areas.type "locale"]
- 	$(MKDIR) [areas.files.installdir]
- 	cd [areas.files.dirname] ; $(INSTALL_[areas.uppervar]) [areas.files.filename] [areas.files.installdir]/$(PACKAGE_NAME)[areas.files.objext][else]
- 	cd [areas.files.dirname] ; $(INSTALL_[areas.uppervar]) [areas.files.filename] $(DESTDIR)[areas.files.install_fname][end][end][for areas.apache_files]
--	cd [areas.apache_files.dirname] ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n [areas.apache_files.name] [areas.apache_files.filename][end]
-+	cd [areas.apache_files.dirname] ; $(MKDIR) "$(DESTDIR)$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n [areas.apache_files.name] [areas.apache_files.filename][end]
- [if-any areas.extra_install]	$(INSTALL_EXTRA_[areas.uppervar])
- [end][end][end]
- 
-
+ install-[areas.type]: [for areas.files][if-index areas.files first][else] [end][areas.files.fullname][end]
+-[if-any areas.files][for areas.files]	[is areas.files.mode "apache-mod"][if-any areas.files.when]if $([areas.files.when]) ; then [else][end]cd [areas.files.dirname] ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n [areas.files.name] [areas.files.filename][if-any areas.files.when] ; fi[else][end][else][if-index areas.files first]$(MKDIR) $(DESTDIR)$([areas.varname]dir)
++[if-any areas.files][for areas.files]	[is areas.files.mode "apache-mod"][if-any areas.files.when]if $([areas.files.when]) ; then [else][end]cd [areas.files.dirname] ; $(MKDIR) "$(DESTDIR)$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n [areas.files.name] [areas.files.filename][if-any areas.files.when] ; fi[else][end][else][if-index areas.files first]$(MKDIR) $(DESTDIR)$([areas.varname]dir)
+ 	[else][end][is areas.type "locale"]$(MKDIR) [areas.files.installdir]
+ 	[if-any areas.files.when]if $([areas.files.when]) ; then [else][end]cd [areas.files.dirname] ; $(INSTALL_[areas.uppervar]) [areas.files.filename] [areas.files.installdir]/$(PACKAGE_NAME)[areas.files.objext][if-any areas.files.when] ; fi[else][end][else][if-any areas.files.when]if $([areas.files.when]) ; then [else][end]cd [areas.files.dirname] ; $(INSTALL_[areas.uppervar]) [areas.files.filename] $(DESTDIR)[areas.files.install_fname][if-any areas.files.when] ; fi[else][end][end][end]
+ [end][else]	$(MKDIR) $(DESTDIR)$([areas.varname]dir)
diff --git a/subversion.spec b/subversion.spec
index 70b7e4c..589faa4 100644
--- a/subversion.spec
+++ b/subversion.spec
@@ -1,9 +1,5 @@
-# TODO:
-# - serf as default: https://subversion.apache.org/docs/release-notes/1.7.html#serf
-#
 # Conditional build:
 %bcond_with	net_client_only		# build only net client
-%bcond_without	neon			# use serf instead of neon
 %bcond_without	swig			# disable bindings generation with Swig
 %bcond_without	python			# build without Python bindings (broken)
 %bcond_without	csvn			# build Python csvn bindings
@@ -44,22 +40,17 @@
 %define	pdir	SVN
 %define	pnam	_Core
 
-%if %{with neon}
-%define	webdavlib	neon
-%else
-%define	webdavlib	serf
-%endif
 %{?with_perl:%include	/usr/lib/rpm/macros.perl}
 Summary:	A Concurrent Versioning system similar to but better than CVS
 Summary(pl.UTF-8):	System kontroli wersji podobny, ale lepszy, niż CVS
 Summary(pt_BR.UTF-8):	Sistema de versionamento concorrente
 Name:		subversion
-Version:	1.7.10
-Release:	2
+Version:	1.8.0
+Release:	0.1
 License:	Apache v2.0
 Group:		Development/Version Control
 Source0:	http://www.idg.pl/mirrors/apache/subversion/%{name}-%{version}.tar.bz2
-# Source0-md5:	4088a77e14232876c9b4ff1541e6e200
+# Source0-md5:	f053a9948dfe5c70eff5c00509723214
 Source1:	%{name}-dav_svn.conf
 Source2:	%{name}-authz_svn.conf
 Source3:	%{name}-svnserve.init
@@ -72,7 +63,6 @@ Patch0:		%{name}-home_etc.patch
 Patch1:		%{name}-DESTDIR.patch
 Patch2:		%{name}-ruby-datadir-path.patch
 Patch3:		%{name}-tests.patch
-Patch4:		subversion-1.7.2-ruby19.patch
 URL:		http://subversion.apache.org/
 %{?with_apache:BuildRequires:	apache-devel >= 2.2.0-8}
 BuildRequires:	apr-devel >= 1:1.0.0
@@ -99,11 +89,7 @@ BuildRequires:	sed >= 4.0
 BuildRequires:	sqlite3-devel >= 3.6.18
 BuildRequires:	texinfo
 BuildRequires:	which
-%if %{with neon}
-BuildRequires:	neon-devel >= 0.26.0
-%else
-BuildRequires:	serf-devel >= 0.7.1
-%endif
+BuildRequires:	serf-devel >= 1.2.1
 %if %{with javahl}
 BuildRequires:	jdk >= 1.5
 BuildRequires:	libstdc++-devel
@@ -179,11 +165,7 @@ System) na comunidade opensource, fornecendo grandes melhorias.
 Summary:	Subversion libraries and modules
 Summary(pl.UTF-8):	Biblioteka subversion oraz ładowalne moduły
 Group:		Libraries
-%if %{with neon}
-Requires:	neon >= 0.26.0
-%else
-Requires:	serf >= 0.7.1
-%endif
+Requires:	serf >= 1.2.1
 Obsoletes:	libsubversion0
 
 %description libs
@@ -199,7 +181,6 @@ Summary(pt_BR.UTF-8):	Arquivos de desenvolvimento para o Subversion
 Group:		Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	apr-util-devel >= 1:1.0.0
-%{?with_neon:Requires:	neon-devel >= 0.26.0}
 Obsoletes:	libsubversion0-devel
 
 %description devel
@@ -447,13 +428,9 @@ uwierzytelniać się przy użyciu Portfela KDE.
 %patch1 -p1
 %patch2 -p0
 %patch3 -p1
-%patch4 -p1
 
 sed -i -e 's#serf_prefix/lib#serf_prefix/%{_lib}#g' build/ac-macros/serf.m4
 
-# serf.m4 macro is broken and ignores --without serf
-%{?with_neon:sed -i -e 's#serf_found="yes"#serf_found="no"#g' build/ac-macros/serf.m4}
-
 %build
 # disabled regeneration - subversion 1.6.13 is not ready for swig 2.0.x
 #%{__rm} subversion/bindings/swig/proxy/*.swg
@@ -471,6 +448,7 @@ chmod +x ./autogen.sh && ./autogen.sh
 	--without-berkeley-db \
 %endif
 %if %{with apache}
+	--with-apache-libexecdir="$(%{_sbindir}/apxs -q LIBEXECDIR)" \
 	--with-apxs=%{_sbindir}/apxs \
 %else
 	--without-apxs \
@@ -495,14 +473,7 @@ chmod +x ./autogen.sh && ./autogen.sh
 %else
 	--disable-javahl \
 %endif
-%if %{with neon}
-	--without-serf \
-	--with-neon=%{_prefix} \
-	--disable-neon-version-check \
-%else
 	--with-serf=%{_prefix} \
-	--without-neon \
-%endif
 	--with-apr=%{_bindir}/apr-1-config \
 	--with-apr-util=%{_bindir}/apu-1-config \
 %if %{with kwallet}
@@ -737,9 +708,11 @@ fi
 %doc tools/xslt/*
 %attr(755,root,root) %{_bindir}/svn
 %attr(755,root,root) %{_bindir}/svnadmin
+%attr(755,root,root) %{_bindir}/svnauthz
+%attr(755,root,root) %{_bindir}/svn-bench
 %attr(755,root,root) %{_bindir}/svndumpfilter
-%attr(755,root,root) %{_bindir}/svnrdump
 %attr(755,root,root) %{_bindir}/svnlook
+%attr(755,root,root) %{_bindir}/svnrdump
 %attr(755,root,root) %{_bindir}/svnsync
 %attr(755,root,root) %{_bindir}/svnversion
 %{_mandir}/man1/svn.1*
@@ -773,8 +746,8 @@ fi
 %attr(755,root,root) %ghost %{_libdir}/libsvn_ra-1.so.0
 %attr(755,root,root) %{_libdir}/libsvn_ra_local-1.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libsvn_ra_local-1.so.0
-%attr(755,root,root) %{_libdir}/libsvn_ra_%{webdavlib}-1.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libsvn_ra_%{webdavlib}-1.so.0
+%attr(755,root,root) %{_libdir}/libsvn_ra_serf-1.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libsvn_ra_serf-1.so.0
 %attr(755,root,root) %{_libdir}/libsvn_ra_svn-1.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libsvn_ra_svn-1.so.0
 %attr(755,root,root) %{_libdir}/libsvn_repos-1.so.*.*.*
@@ -797,7 +770,7 @@ fi
 %attr(755,root,root) %{_libdir}/libsvn_fs_util-1.so
 %attr(755,root,root) %{_libdir}/libsvn_ra-1.so
 %attr(755,root,root) %{_libdir}/libsvn_ra_local-1.so
-%attr(755,root,root) %{_libdir}/libsvn_ra_%{webdavlib}-1.so
+%attr(755,root,root) %{_libdir}/libsvn_ra_serf-1.so
 %attr(755,root,root) %{_libdir}/libsvn_ra_svn-1.so
 %attr(755,root,root) %{_libdir}/libsvn_repos-1.so
 %attr(755,root,root) %{_libdir}/libsvn_subr-1.so
@@ -813,7 +786,7 @@ fi
 %{_libdir}/libsvn_fs_util-1.la
 %{_libdir}/libsvn_ra-1.la
 %{_libdir}/libsvn_ra_local-1.la
-%{_libdir}/libsvn_ra_%{webdavlib}-1.la
+%{_libdir}/libsvn_ra_serf-1.la
 %{_libdir}/libsvn_ra_svn-1.la
 %{_libdir}/libsvn_repos-1.la
 %{_libdir}/libsvn_subr-1.la
@@ -834,7 +807,7 @@ fi
 %{_libdir}/libsvn_fs_util-1.a
 %{_libdir}/libsvn_ra-1.a
 %{_libdir}/libsvn_ra_local-1.a
-%{_libdir}/libsvn_ra_%{webdavlib}-1.a
+%{_libdir}/libsvn_ra_serf-1.a
 %{_libdir}/libsvn_ra_svn-1.a
 %{_libdir}/libsvn_repos-1.a
 %{_libdir}/libsvn_subr-1.a
@@ -878,15 +851,22 @@ fi
 %attr(755,root,root) %{_bindir}/svndiff4
 
 # tools/server-side
+%attr(755,root,root) %{_bindir}/fsfs-stats
 %attr(755,root,root) %{_bindir}/svn-populate-node-origins-index
 %attr(755,root,root) %{_bindir}/svn-rep-sharing-stats
 %attr(755,root,root) %{_bindir}/svnauthz-validate
 
 # tools/client-side/svnmucc
 %attr(755,root,root) %{_bindir}/svnmucc
+%{_mandir}/man1/svnmucc.1*
+
 # tools/dev/svnraisetreeconflict
 %attr(755,root,root) %{_bindir}/svnraisetreeconflict
 
+# tools/dev/
+%attr(755,root,root) %{_bindir}/fsfs-access-map
+%attr(755,root,root) %{_bindir}/fsfs-reorg
+
 %files -n bash-completion-subversion
 %defattr(644,root,root,755)
 /etc/bash_completion.d/%{name}
-- 
2.44.0