X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=subversion.spec;h=efda725b781c8db12c4ab7e70b4bd95ece904d0b;hb=0a8cf0ad8f01aeed1ad9fba0ad97daca5a5fd026;hp=10041c6b412a21136cc5ce9381a32f2f5cd02eed;hpb=ba97fd5e37c50025a4916d815bf6d9c528caf353;p=packages%2Fsubversion.git

diff --git a/subversion.spec b/subversion.spec
index 10041c6..efda725 100644
--- a/subversion.spec
+++ b/subversion.spec
@@ -9,8 +9,8 @@
 %bcond_without	apache			# build without Apache support (webdav, etc)
 %bcond_without	java			# build without javahl support (Java high-level bindings)
 %bcond_with	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	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)
@@ -50,12 +50,12 @@ 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.9.6
-Release:	1
+Version:	1.11.0
+Release:	2
 License:	Apache v2.0
 Group:		Development/Version Control
 Source0:	http://www.apache.org/dist/subversion/%{name}-%{version}.tar.bz2
-# Source0-md5:	f27e00338d4a9f7f9aec9d4a3f8b418b
+# Source0-md5:	b0401a17fe9f4a769e36fcfcfad93461
 Source1:	%{name}-dav_svn.conf
 Source2:	%{name}-authz_svn.conf
 Source3:	%{name}-svnserve.init
@@ -73,6 +73,7 @@ URL:		http://subversion.apache.org/
 %{?with_apache:BuildRequires:	apache-devel >= 2.4.14}
 BuildRequires:	apr-devel >= 1:1.3
 BuildRequires:	apr-util-devel >= 1:1.3
+BuildRequires:	apr-util-crypto-openssl
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake
 BuildRequires:	bison
@@ -85,21 +86,26 @@ BuildRequires:	db-devel >= 4.1.25
 BuildRequires:	expat-devel
 BuildRequires:	gettext-tools
 %{?with_gnome:BuildRequires:	glib2-devel >= 2.0}
-%{?with_kwallet:BuildRequires:	kde4-kdelibs-devel}
+%{?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.656
 BuildRequires:	sed >= 4.0
 BuildRequires:	serf-devel >= 1.3.4
-BuildRequires:	sqlite3-devel >= 3.7.12
+BuildRequires:	sqlite3-devel >= 3.8.11.1
 BuildRequires:	texinfo
 BuildRequires:	which
+BuildRequires:	zlib-devel >= 1.2
 %if %{with java}
-BuildRequires:	jdk >= 1.5
+BuildRequires:	jdk >= 1.8
 BuildRequires:	libstdc++-devel
 %endif
 %if %{with perl}
@@ -177,6 +183,7 @@ Group:		Libraries
 Requires:	apr >= 1:1.3
 Requires:	apr-util >= 1:1.3
 Requires:	serf >= 1.3.4
+Requires:	zlib >= 1.2
 Obsoletes:	libsubversion0
 
 %description libs
@@ -423,17 +430,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.
 
@@ -645,7 +652,7 @@ cp -p tools/examples/*.c $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 %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}
@@ -681,8 +688,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
@@ -731,10 +738,14 @@ 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}/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
@@ -878,7 +889,7 @@ fi
 %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