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

diff --git a/subversion.spec b/subversion.spec
index 10041c6..ff38fba 100644
--- a/subversion.spec
+++ b/subversion.spec
@@ -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.10.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:	0126847f9e8cb8ed0b90a6a18b203309
 Source1:	%{name}-dav_svn.conf
 Source2:	%{name}-authz_svn.conf
 Source3:	%{name}-svnserve.init
@@ -69,6 +69,7 @@ Patch1:		%{name}-DESTDIR.patch
 Patch2:		%{name}-ruby-datadir-path.patch
 Patch3:		%{name}-tests.patch
 Patch4:		x32-libdir.patch
+Patch5:		%{name}-rdoc.patch
 URL:		http://subversion.apache.org/
 %{?with_apache:BuildRequires:	apache-devel >= 2.4.14}
 BuildRequires:	apr-devel >= 1:1.3
@@ -87,17 +88,20 @@ BuildRequires:	gettext-tools
 %{?with_gnome:BuildRequires:	glib2-devel >= 2.0}
 %{?with_kwallet:BuildRequires:	kde4-kdelibs-devel}
 %{?with_gnome:BuildRequires:	libgnome-keyring-devel}
+%{?with_gnome:BuildRequires:	libsecret-devel}
 BuildRequires:	libmagic-devel
 BuildRequires:	libtool >= 1.4-9
+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:	libstdc++-devel
@@ -177,6 +181,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
@@ -444,6 +449,7 @@ uwierzytelniać się przy użyciu Portfela KDE.
 %patch2 -p0
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 sed -i -e 's#serf_prefix/lib#serf_prefix/%{_lib}#g' build/ac-macros/serf.m4
 
@@ -455,6 +461,7 @@ chmod +x ./autogen.sh && ./autogen.sh
 %{__libtoolize}
 %configure \
 	--with-editor=vi \
+	--with-utf8proc=internal \
 	--with-zlib=%{_libdir} \
 	--disable-runtime-module-search \
 	--disable-mod-activation \
@@ -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}
@@ -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