X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=blobdiff_plain;f=subversion.spec;h=398af53b0ff59e2b587be49687a27e95f5e8106b;hb=5cc7c89554d6c846a1f05fd04553112ffe42b736;hp=afbd30fa0b25764d9b2652bfacc79dff5b8c53c0;hpb=af7982c05f21b1b5cabbdba2c41085f599998176;p=packages%2Fsubversion.git

diff --git a/subversion.spec b/subversion.spec
index afbd30f..398af53 100644
--- a/subversion.spec
+++ b/subversion.spec
@@ -1,25 +1,30 @@
 #
 # 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
 %bcond_without	perl			# build without Perl bindings
-%bcond_with	ruby			# build with Ruby bindings (only 1.8.x is supported)
+%bcond_without	ruby			# build without Ruby bindings
 %bcond_without	apache			# build without Apache support (webdav, etc)
-%bcond_without	javahl			# build without javahl support (Java high-level bindings)
-%bcond_without	tests			# don't perform "make check"
-%bcond_without	kwallet			# build without kde4 wallet support
-%bcond_without	kde			# build without kde4 support (alias for kwallet)
+%bcond_without	java			# build without javahl support (Java high-level bindings)
+%bcond_with	tests			# don't perform "make check"
+%bcond_without	kwallet			# build without kde5 wallet support
+%bcond_without	kde			# build without kde5 support (alias for kwallet)
 %bcond_without	gnome			# build without gnome keyring support
 %bcond_without	db			# disable Subversion Berkeley DB based filesystem library
+%bcond_with	db6			# allow BDB6 (not tested by upstream, released on AGPL)
+
+# for AC: --without csvn,gnome,java,kde,ruby
 
 %if %{with net_client_only}
 %undefine	with_apache
 %undefine	with_db
 %undefine	with_swig
-%undefine	with_javahl
+%undefine	with_java
+%undefine	with_csvn
+%undefine	with_gnome
+%undefine	with_kde
 %endif
 
 %if %{without swig}
@@ -40,22 +45,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.0
-Release:	3
-License:	Apache/BSD-like
+Version:	1.10.0
+Release:	6
+License:	Apache v2.0
 Group:		Development/Version Control
 Source0:	http://www.apache.org/dist/subversion/%{name}-%{version}.tar.bz2
-# Source0-md5:	930e6644a1b6094efd268fde6a318f04
+# Source0-md5:	0126847f9e8cb8ed0b90a6a18b203309
 Source1:	%{name}-dav_svn.conf
 Source2:	%{name}-authz_svn.conf
 Source3:	%{name}-svnserve.init
@@ -68,11 +68,13 @@ Patch0:		%{name}-home_etc.patch
 Patch1:		%{name}-DESTDIR.patch
 Patch2:		%{name}-ruby-datadir-path.patch
 Patch3:		%{name}-tests.patch
-Patch4:		%{name}-mod_dav_svn-fix-hook.patch
+Patch4:		x32-libdir.patch
+Patch5:		%{name}-rdoc.patch
+Patch6:		with_gnome_keyring_sefault.patch
 URL:		http://subversion.apache.org/
-%{?with_apache:BuildRequires:	apache-devel >= 2.2.0-8}
-BuildRequires:	apr-devel >= 1:1.0.0
-BuildRequires:	apr-util-devel >= 1:1.2.8-3
+%{?with_apache:BuildRequires:	apache-devel >= 2.4.14}
+BuildRequires:	apr-devel >= 1:1.3
+BuildRequires:	apr-util-devel >= 1:1.3
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake
 BuildRequires:	bison
@@ -80,27 +82,30 @@ BuildRequires:	cyrus-sasl-devel
 %if %{with kwallet} || %{with gnome}
 BuildRequires:	dbus-devel
 %endif
+%{!?with_db6:BuildRequires:	db-devel < 6}
 BuildRequires:	db-devel >= 4.1.25
 BuildRequires:	expat-devel
-BuildRequires:	gettext-devel
-%{?with_kwallet:BuildRequires:	kde4-kdelibs-devel}
+BuildRequires:	gettext-tools
+%{?with_gnome:BuildRequires:	glib2-devel >= 2.0}
+%{?with_kde:BuildRequires:	kf5-kdelibs4support-devel}
+%{?with_kwallet:BuildRequires:	kf5-kwallet-devel}
 %{?with_gnome:BuildRequires:	libgnome-keyring-devel}
+%{?with_gnome:BuildRequires:	libsecret-devel}
 BuildRequires:	libmagic-devel
 BuildRequires:	libtool >= 1.4-9
+BuildRequires:	libutf8proc-devel >= 1.3.1-4
+BuildRequires:	lz4-devel
 BuildRequires:	pkgconfig
 %{?with_csvn:BuildRequires:	python-ctypesgen}
 BuildRequires:	rpm-pythonprov
-BuildRequires:	rpmbuild(macros) >= 1.583
+BuildRequires:	rpmbuild(macros) >= 1.656
 BuildRequires:	sed >= 4.0
-BuildRequires:	sqlite3-devel >= 3.6.18
+BuildRequires:	serf-devel >= 1.3.4
+BuildRequires:	sqlite3-devel >= 3.8.11.1
 BuildRequires:	texinfo
 BuildRequires:	which
-%if %{with neon}
-BuildRequires:	neon-devel >= 0.26.0
-%else
-BuildRequires:	serf-devel >= 0.7.1
-%endif
-%if %{with javahl}
+BuildRequires:	zlib-devel >= 1.2
+%if %{with java}
 BuildRequires:	jdk >= 1.5
 BuildRequires:	libstdc++-devel
 %endif
@@ -114,8 +119,9 @@ BuildRequires:	python-devel >= 1:2.4
 BuildRequires:	swig-python >= 1.3.24
 %endif
 %if %{with ruby}
+BuildRequires:	rpm-rubyprov
 BuildRequires:	ruby-devel >= 1:1.8.2
-BuildRequires:	ruby-devel < 1:1.9
+BuildRequires:	ruby-irb
 BuildRequires:	ruby-rubygems
 BuildRequires:	swig-ruby >= 1.3.24
 %endif
@@ -127,7 +133,7 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define		apacheconfdir	%(%{apxs} -q SYSCONFDIR 2>/dev/null)/conf.d
 %define		apachelibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
 
-%define		skip_post_check_so	libsvn_swig_py-1.so.* libsvn_swig_perl-1.so.*
+%define		skip_post_check_so	libsvn_swig_py-1.so.* libsvn_swig_perl-1.so.* libsvn_fs_x-1.so.*
 
 %description
 The goal of the Subversion project is to build a version control
@@ -175,11 +181,10 @@ 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:	apr >= 1:1.3
+Requires:	apr-util >= 1:1.3
+Requires:	serf >= 1.3.4
+Requires:	zlib >= 1.2
 Obsoletes:	libsubversion0
 
 %description libs
@@ -194,8 +199,8 @@ Summary(pl.UTF-8):	Pliki nagłówkowe i dokumetacja do subversion
 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}
+Requires:	apr-util-devel >= 1:1.3
+Requires:	serf-devel >= 1.3.4
 Obsoletes:	libsubversion0-devel
 
 %description devel
@@ -254,8 +259,8 @@ Summary:	Subversion tools and scripts
 Summary(pl.UTF-8):	Narzędzia oraz skrypty dla subversion
 Summary(pt_BR.UTF-8):	Módulos python para acessar os recursos do Subversion
 Group:		Applications
-%pyrequires_eq	python
 Requires:	%{name} = %{version}-%{release}
+Requires:	python
 Requires:	python-subversion = %{version}
 
 %description tools
@@ -271,6 +276,9 @@ Group:		Applications/Shells
 Requires:	%{name} = %{version}-%{release}
 Requires:	bash-completion
 Conflicts:	%{name}-tools <= 1.1.0-0.rc6.1
+%if "%{_rpmversion}" >= "5"
+BuildArch:	noarch
+%endif
 
 %description -n bash-completion-subversion
 Bash completion for subversion.
@@ -302,8 +310,8 @@ Summary:	Subversion Python bindings
 Summary(pl.UTF-8):	Dowiązania do Subversion dla Pythona
 Summary(pt_BR.UTF-8):	Módulos Python para acessar os recursos do Subversion
 Group:		Development/Languages/Python
-%pyrequires_eq	python
 Requires:	%{name}-libs = %{version}-%{release}
+Requires:	python
 Obsoletes:	subversion-python
 
 %description -n python-subversion
@@ -320,8 +328,8 @@ Summary:	CTypes Subversion Python bindings
 Summary(pl.UTF-8):	Dowiązania do Subversion dla Pythona
 Summary(pt_BR.UTF-8):	Módulos Python para acessar os recursos do Subversion
 Group:		Development/Languages/Python
-%pyrequires_eq	python
 Requires:	%{name}-libs = %{version}-%{release}
+Requires:	python
 
 %description -n python-csvn
 Subversion CTypes Python bindings.
@@ -368,7 +376,7 @@ Módulos Ruby para acessar os recursos do Subversion.
 
 %package -n apache-mod_dav_svn
 Summary:	Apache module: Subversion Server
-Summary(pl.UTF-8):	Moduł apache: Serwer Subversion
+Summary(pl.UTF-8):	Moduł Apache'a: serwer Subversion
 Group:		Networking/Daemons
 Requires:	%{name} = %{version}-%{release}
 Requires:	apache(modules-api) = %apache_modules_api
@@ -378,12 +386,13 @@ Requires:	apache-mod_dav
 Apache module: Subversion Server.
 
 %description -n apache-mod_dav_svn -l pl.UTF-8
-Moduł apache: Serwer Subversion.
+Moduł Apache'a: serwer Subversion.
 
 %package -n apache-mod_authz_svn
 Summary:	Apache module: Subversion Server - path-based authorization
-Summary(pl.UTF-8):	Moduł apache: autoryzacja na podstawie ścieżki dla serwera Subversion
+Summary(pl.UTF-8):	Moduł Apache'a: autoryzacja na podstawie ścieżki dla serwera Subversion
 Group:		Networking/Daemons
+Requires:	%{name}-libs = %{version}-%{release}
 Requires:	apache(modules-api) = %apache_modules_api
 Requires:	apache-mod_dav_svn = %{version}-%{release}
 
@@ -391,12 +400,28 @@ Requires:	apache-mod_dav_svn = %{version}-%{release}
 Apache module: Subversion Server - path-based authorization.
 
 %description -n apache-mod_authz_svn -l pl.UTF-8
-Moduł apache: autoryzacja na podstawie ścieżki dla serwera Subversion.
+Moduł Apache'a: autoryzacja na podstawie ścieżki dla serwera
+Subversion.
+
+%package -n apache-mod_dontdothat_svn
+Summary:	Apache module: Allows you to block specific svn requests
+Summary(pl.UTF-8):	Moduł Apache'a pozwalający na blokowanie pewnych zapytań svn
+Group:		Networking/Daemons
+Requires:	%{name}-libs = %{version}-%{release}
+Requires:	apache(modules-api) = %apache_modules_api
+Requires:	apache-mod_dav_svn = %{version}-%{release}
+
+%description -n apache-mod_dontdothat_svn
+Apache module: Allows you to block specific svn requests.
+
+%description -n apache-mod_dontdothat_svn -l pl.UTF-8
+Moduł Apache'a pozwalający na blokowanie pewnych zapytań svn.
 
 %package -n gnome-keyring-subversion
 Summary:	GNOME Keyring authentication provider for Subversion
 Summary(pl.UTF-8):	Moduł uwierzytelniający GNOME Keyring dla Subversion
 Group:		X11/Applications
+Requires:	%{name}-libs = %{version}-%{release}
 
 %description -n gnome-keyring-subversion
 Authentication provider module for Subversion which allows SVN client
@@ -406,16 +431,17 @@ to authenticate using GNOME Keyring.
 Moduł uwierzytelniający dla Subversion pozwalający klientom SVN
 uwierzytelniać się przy użyciu mechanizmu GNOME Keyring.
 
-%package -n kde4-kwallet-subversion
+%package -n kde5-kwallet-subversion
 Summary:	KDE Wallet authentication provider for Subversion
 Summary(pl.UTF-8):	Moduł uwierzytelniający dla Subversion wykorzystujący Portfel KDE
 Group:		X11/Applications
+Requires:	%{name}-libs = %{version}-%{release}
 
-%description -n kde4-kwallet-subversion
+%description -n kde5-kwallet-subversion
 Authentication provider module for Subversion which allows SVN client
 to authenticate using KDE Wallet.
 
-%description -n kde4-kwallet-subversion -l pl.UTF-8
+%description -n kde5-kwallet-subversion -l pl.UTF-8
 Moduł uwierzytelniający dla Subversion pozwalający klientom SVN
 uwierzytelniać się przy użyciu Portfela KDE.
 
@@ -426,12 +452,11 @@ uwierzytelniać się przy użyciu Portfela KDE.
 %patch2 -p0
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p0
 
 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
@@ -445,10 +470,12 @@ chmod +x ./autogen.sh && ./autogen.sh
 	--disable-mod-activation \
 %if %{with db}
 	--with-berkeley-db="db.h:%{_includedir}:%{_libdir}:db" \
+	%{?with_db6:--enable-bdb6} \
 %else
 	--without-berkeley-db \
 %endif
 %if %{with apache}
+	--with-apache-libexecdir="$(%{_sbindir}/apxs -q LIBEXECDIR)" \
 	--with-apxs=%{_sbindir}/apxs \
 %else
 	--without-apxs \
@@ -456,27 +483,24 @@ chmod +x ./autogen.sh && ./autogen.sh
 %if %{without swig}
 	--without-swig \
 %endif
-%if %{without ruby}
+%if %{with ruby}
+	svn_cv_ruby_sitedir_libsuffix="" \
+	svn_cv_ruby_sitedir_archsuffix="" \
+	--with-ruby-sitedir=%{ruby_vendorarchdir} \
+%else
 	ac_cv_path_RUBY=none \
 %endif
 %if %{with csvn}
 	--with-ctypesgen=%{_bindir}/ctypesgen.py \
 %endif
-%if %{with javahl}
+%if %{with java}
 	--enable-javahl \
 	--with-jdk="%{java_home}" \
 	--without-jikes \
 %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}
@@ -488,6 +512,8 @@ chmod +x ./autogen.sh && ./autogen.sh
 
 %{__make} -j1
 
+%{__make} tools
+
 %if %{with csvn}
 # Python ctypes bindings
 %{__make} ctypes-python
@@ -506,7 +532,7 @@ cd subversion/bindings/swig/perl/native
 %{__make} -j1
 cd -
 %endif
-%if %{with javahl}
+%if %{with java}
 %{__make} -j1 javahl \
 	javahl_javadir="%{_javadir}"
 %endif
@@ -540,10 +566,12 @@ install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig,bash_completion.d} \
 	$RPM_BUILD_ROOT%{_sysconfdir}/%{name} \
 	$RPM_BUILD_ROOT/home/services/subversion{,/repos}
 
-%{__make} install -j1 \
+%{__make} -j1 install \
+	pkgconfig_dir=%{_pkgconfigdir} \
+	toolsdir=%{_bindir} \
 	DESTDIR=$RPM_BUILD_ROOT \
 	APACHE_LIBEXECDIR="$(%{_sbindir}/apxs -q LIBEXECDIR)" \
-%if %{with javahl}
+%if %{with java}
 	install-javahl \
 	javahl_javadir="%{_javadir}" \
 %endif
@@ -552,20 +580,26 @@ install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig,bash_completion.d} \
 	swig_pydir=%{py_sitedir}/libsvn \
 	swig_pydir_extra=%{py_sitedir}/svn \
 %endif
+	install-tools
+
 %if %{with csvn}
-	install-ctypes-python \
+# manually execute install-ctypes-python target
+cd subversion/bindings/ctypes-python
+%py_install
+cd ../../..
 %endif
 
 %if %{with ruby}
-%{__make} install -j1 \
-	DESTDIR=$RPM_BUILD_ROOT \
-	install-swig-rb install-swig-rb-doc \
+%{__make} -j1 install-swig-rb install-swig-rb-doc \
+	SWIG_RB_RI_DATADIR=$RPM_BUILD_ROOT%{ruby_ridir} \
+	DESTDIR=$RPM_BUILD_ROOT
 
 # not our package
-%{__rm} -r $RPM_BUILD_ROOT%{ruby_ridir}/Kernel
 %{__rm} -r $RPM_BUILD_ROOT%{ruby_ridir}/OptionParser
 %{__rm} -r $RPM_BUILD_ROOT%{ruby_ridir}/Time
-%{__rm} -r $RPM_BUILD_ROOT%{ruby_ridir}/Uconv
+%if "%{ruby_abi}" >= "2.0"
+%{__rm} -r $RPM_BUILD_ROOT%{ruby_ridir}/File
+%endif
 %{__rm} $RPM_BUILD_ROOT%{ruby_ridir}/cache.ri
 %{__rm} $RPM_BUILD_ROOT%{ruby_ridir}/created.rid
 %endif
@@ -589,6 +623,12 @@ install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/svnserve
 %if %{without net_client_only}
 install -p tools/backup/hot-backup.py $RPM_BUILD_ROOT%{_bindir}/svn-hot-backup
 %endif
+
+# rename not to conflict with standard packages. (are these needed at all?)
+%{__mv} $RPM_BUILD_ROOT%{_bindir}/{,svn}diff
+%{__mv} $RPM_BUILD_ROOT%{_bindir}/{,svn}diff3
+%{__mv} $RPM_BUILD_ROOT%{_bindir}/{,svn}diff4
+
 %if %{with python} || %{with csvn}
 %py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
 %py_comp $RPM_BUILD_ROOT%{py_sitedir}
@@ -604,18 +644,18 @@ cp -p tools/examples/*.py $RPM_BUILD_ROOT%{_examplesdir}/python-%{name}-%{versio
 cp -p tools/client-side/bash_completion $RPM_BUILD_ROOT/etc/bash_completion.d/%{name}
 cp -p tools/examples/*.c $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
-%if %{with javahl}
+%if %{with java}
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libsvnjavahl*.{la,a}
 %endif
 %if %{with swig}
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libsvn_swig*.{la,a}
 %if %{with ruby}
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/ruby/site_ruby/*/*/svn/ext/*.la
+%{__rm} $RPM_BUILD_ROOT%{ruby_vendorarchdir}/svn/ext/*.la
 %endif
 %endif
 %if %{with gnome} || %{with kwallet}
 # dlopened by soname (libsvn_auth_*-1.so.0)
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libsvn_auth_*-1.{so,la,a}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libsvn_auth_*-1.{so,la}
 %endif
 
 %find_lang %{name}
@@ -651,8 +691,8 @@ rm -rf $RPM_BUILD_ROOT
 %post	-n gnome-keyring-subversion -p /sbin/ldconfig
 %postun	-n gnome-keyring-subversion -p /sbin/ldconfig
 
-%post	-n kde4-kwallet-subversion -p /sbin/ldconfig
-%postun	-n kde4-kwallet-subversion -p /sbin/ldconfig
+%post	-n kde5-kwallet-subversion -p /sbin/ldconfig
+%postun	-n kde5-kwallet-subversion -p /sbin/ldconfig
 
 %post svnserve
 /sbin/chkconfig --add svnserve
@@ -686,6 +726,14 @@ if [ "$1" = "0" ]; then
 	%service -q httpd restart
 fi
 
+%post -n apache-mod_dontdothat_svn
+%service -q httpd restart
+
+%postun -n apache-mod_dontdothat_svn
+if [ "$1" = "0" ]; then
+	%service -q httpd restart
+fi
+
 %files
 %defattr(644,root,root,755)
 %doc BUGS CHANGES INSTALL README
@@ -693,11 +741,16 @@ fi
 %doc tools/hook-scripts/*.{pl,py,example}
 %doc tools/hook-scripts/mailer/*.{py,example}
 %doc tools/xslt/*
+%attr(755,root,root) %{_bindir}/fsfs-stats
 %attr(755,root,root) %{_bindir}/svn
+%attr(755,root,root) %{_bindir}/svn-mergeinfo-normalizer
 %attr(755,root,root) %{_bindir}/svnadmin
+%attr(755,root,root) %{_bindir}/svnconflict
 %attr(755,root,root) %{_bindir}/svndumpfilter
-%attr(755,root,root) %{_bindir}/svnrdump
 %attr(755,root,root) %{_bindir}/svnlook
+%attr(755,root,root) %{_bindir}/svnmover
+%attr(755,root,root) %{_bindir}/svnmucc
+%attr(755,root,root) %{_bindir}/svnrdump
 %attr(755,root,root) %{_bindir}/svnsync
 %attr(755,root,root) %{_bindir}/svnversion
 %{_mandir}/man1/svn.1*
@@ -705,6 +758,7 @@ fi
 %{_mandir}/man1/svndumpfilter.1*
 %{_mandir}/man1/svnrdump.1*
 %{_mandir}/man1/svnlook.1*
+%{_mandir}/man1/svnmucc.1*
 %{_mandir}/man1/svnsync.1*
 %{_mandir}/man1/svnversion.1*
 
@@ -727,12 +781,14 @@ fi
 %attr(755,root,root) %ghost %{_libdir}/libsvn_fs_fs-1.so.0
 %attr(755,root,root) %{_libdir}/libsvn_fs_util-1.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libsvn_fs_util-1.so.0
+%attr(755,root,root) %{_libdir}/libsvn_fs_x-1.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libsvn_fs_x-1.so.0
 %attr(755,root,root) %{_libdir}/libsvn_ra-1.so.*.*.*
 %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.*.*.*
@@ -753,9 +809,10 @@ fi
 %endif
 %attr(755,root,root) %{_libdir}/libsvn_fs_fs-1.so
 %attr(755,root,root) %{_libdir}/libsvn_fs_util-1.so
+%attr(755,root,root) %{_libdir}/libsvn_fs_x-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
@@ -769,13 +826,39 @@ fi
 %endif
 %{_libdir}/libsvn_fs_fs-1.la
 %{_libdir}/libsvn_fs_util-1.la
+%{_libdir}/libsvn_fs_x-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
 %{_libdir}/libsvn_wc-1.la
+%if %{with gnome}
+# only for feature check, linking will fail (no libsvn_auth_gnome_keyring.so)
+%{_pkgconfigdir}/libsvn_auth_gnome_keyring.pc
+%endif
+%if %{with kwallet}
+# only for feature check, linking will fail (no libsvn_auth_kwallet.so)
+%{_pkgconfigdir}/libsvn_auth_kwallet.pc
+%endif
+%{_pkgconfigdir}/libsvn_client.pc
+%{_pkgconfigdir}/libsvn_delta.pc
+%{_pkgconfigdir}/libsvn_diff.pc
+%{_pkgconfigdir}/libsvn_fs.pc
+%if %{without net_client_only}
+%{_pkgconfigdir}/libsvn_fs_base.pc
+%endif
+%{_pkgconfigdir}/libsvn_fs_fs.pc
+%{_pkgconfigdir}/libsvn_fs_util.pc
+%{_pkgconfigdir}/libsvn_fs_x.pc
+%{_pkgconfigdir}/libsvn_ra.pc
+%{_pkgconfigdir}/libsvn_ra_local.pc
+%{_pkgconfigdir}/libsvn_ra_serf.pc
+%{_pkgconfigdir}/libsvn_ra_svn.pc
+%{_pkgconfigdir}/libsvn_repos.pc
+%{_pkgconfigdir}/libsvn_subr.pc
+%{_pkgconfigdir}/libsvn_wc.pc
 %{_includedir}/%{name}-1
 %{_examplesdir}/%{name}-%{version}
 
@@ -790,9 +873,10 @@ fi
 %endif
 %{_libdir}/libsvn_fs_fs-1.a
 %{_libdir}/libsvn_fs_util-1.a
+%{_libdir}/libsvn_fs_x-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
@@ -803,13 +887,17 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libsvn_auth_gnome_keyring-1.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libsvn_auth_gnome_keyring-1.so.0
+# does anything use it? requires libsvn_auth_gnome_keyring.so
+#%{_pkgconfigdir}/libsvn_auth_gnome_keyring.pc
 %endif
 
 %if %{with kwallet}
-%files -n kde4-kwallet-subversion
+%files -n kde5-kwallet-subversion
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libsvn_auth_kwallet-1.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libsvn_auth_kwallet-1.so.0
+# does anything use it? requires libsvn_auth_kwallet.so
+#%{_pkgconfigdir}/libsvn_auth_kwallet.pc
 %endif
 
 %if %{without net_client_only}
@@ -827,15 +915,37 @@ fi
 
 %files tools
 %defattr(644,root,root,755)
+# tools/backup/hot-backup.py
 %attr(755,root,root) %{_bindir}/svn-hot-backup
 
+# tools/diff
+%attr(755,root,root) %{_bindir}/svndiff
+%attr(755,root,root) %{_bindir}/svndiff3
+%attr(755,root,root) %{_bindir}/svndiff4
+
+# tools/server-side
+%attr(755,root,root) %{_bindir}/svnfsfs
+%attr(755,root,root) %{_bindir}/svn-populate-node-origins-index
+%attr(755,root,root) %{_bindir}/svnauthz
+%attr(755,root,root) %{_bindir}/svnauthz-validate
+
+# tools/client-side
+%attr(755,root,root) %{_bindir}/svnbench
+
+# tools/dev/svnraisetreeconflict
+%attr(755,root,root) %{_bindir}/svnraisetreeconflict
+
+# tools/dev/
+%attr(755,root,root) %{_bindir}/fsfs-access-map
+%attr(755,root,root) %{_bindir}/x509-parser
+
 %files -n bash-completion-subversion
 %defattr(644,root,root,755)
 /etc/bash_completion.d/%{name}
 
 %endif # net_client_only
 
-%if %{with javahl}
+%if %{with java}
 %files -n java-subversion
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libsvnjavahl-1.so.*.*.*
@@ -883,7 +993,6 @@ fi
 %dir %{perl_vendorarch}/auto/SVN
 %dir %{perl_vendorarch}/auto/SVN/*
 %attr(755,root,root) %{perl_vendorarch}/auto/SVN/*/*.so
-%{perl_vendorarch}/auto/SVN/*/*.bs
 %{_mandir}/man3/*.3pm*
 %endif
 
@@ -893,11 +1002,10 @@ fi
 %attr(755,root,root) %{_libdir}/libsvn_swig_ruby-1.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libsvn_swig_ruby-1.so.0
 %attr(755,root,root) %{_libdir}/libsvn_swig_ruby-1.so
-%dir %{ruby_sitelibdir}/svn
-%{ruby_sitelibdir}/svn/*.rb
-%dir %{ruby_sitearchdir}/svn
-%dir %{ruby_sitearchdir}/svn/ext
-%attr(755,root,root) %{ruby_sitearchdir}/svn/ext/*.so
+%dir %{ruby_vendorarchdir}/svn
+%{ruby_vendorarchdir}/svn/*.rb
+%dir %{ruby_vendorarchdir}/svn/ext
+%attr(755,root,root) %{ruby_vendorarchdir}/svn/ext/*.so
 %{ruby_ridir}/Svn
 %endif
 
@@ -912,4 +1020,9 @@ fi
 %doc subversion/mod_authz_svn/INSTALL
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{apacheconfdir}/*_mod_authz_svn.conf
 %attr(755,root,root) %{apachelibdir}/mod_authz_svn.so
+
+%files -n apache-mod_dontdothat_svn
+%defattr(644,root,root,755)
+%doc tools/server-side/mod_dontdothat/README
+%attr(755,root,root) %{apachelibdir}/mod_dontdothat.so
 %endif