commit 535649a67701be9c486d047565668ef2944f9396
Author: Jan Palus <at...@pld-linux.org>
Date: Sat Apr 14 17:42:39 2018 +0200
up to 1.10.0
- keep on building with internal utf8proc until one in PLD is upgraded
to 2.1.0
subversion-rdoc.patch | 12 ++++++++++++
subversion.spec | 15 +++++++++++----
2 files changed, 23 insertions(+), 4 deletions(-)
---
diff --git a/subversion.spec b/subversion.spec
index 915b5d8..6aad668 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.7
-Release: 3
+Version: 1.10.0
+Release: 1
License: Apache v2.0
Group: Development/Version Control
Source0: http://www.apache.org/dist/subversion/%{name}-%{version}.tar.bz2
-# Source0-md5: 05b0c677681073920f938c1f322e0be2
+# 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
@@ -444,6 +445,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 +457,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 +648,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 +734,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
diff --git a/subversion-rdoc.patch b/subversion-rdoc.patch
new file mode 100644
index 0000000..f2e0c5c
--- /dev/null
+++ b/subversion-rdoc.patch
@@ -0,0 +1,12 @@
+diff -urN subversion-1.10.0.orig/configure.ac subversion-1.10.0/configure.ac
+--- subversion-1.10.0.orig/configure.ac 2018-04-14 17:34:49.273616506
+0200
++++ subversion-1.10.0/configure.ac 2018-04-14 17:34:58.360223966 +0200
+@@ -1323,7 +1323,7 @@
+ if test -n "$RDOC"; then
+ AC_PATH_PROG(RDOC, "$RDOC", none)
+ else
+- AC_PATH_PROGS(RUBY, rdoc rdoc1 rdoc1.8 rdoc18 rdoc1.9 rdoc19 rdoc1.9.3
rdoc193 rdoc2 rdoc2.0 rdoc20 rdoc2.1 rdoc21 rdoc2.2 rdoc22 rdoc2.3 rdoc23
rdoc2.4 rdoc24, none)
++ AC_PATH_PROGS(RDOC, rdoc rdoc1 rdoc1.8 rdoc18 rdoc1.9 rdoc19 rdoc1.9.3
rdoc193 rdoc2 rdoc2.0 rdoc20 rdoc2.1 rdoc21 rdoc2.2 rdoc22 rdoc2.3 rdoc23
rdoc2.4 rdoc24, none)
+ fi
+ AC_CACHE_CHECK([for Ruby major version], [svn_cv_ruby_major],[
+ svn_cv_ruby_major="`$RUBY -rrbconfig -e 'print
RbConfig::CONFIG.fetch(%q(MAJOR))'`"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/subversion.git/commitdiff/535649a67701be9c486d047565668ef2944f9396
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
