From f9c8674f55c2085dcda503bf95d0b8fdd3e29a40 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Fri, 7 Aug 2015 18:17:56 +0200 Subject: [PATCH] - up to 1.9.0 --- subversion-DESTDIR.patch | 10 +++++----- subversion.spec | 37 +++++++++++++++++++++++++++++-------- 2 files changed, 34 insertions(+), 13 deletions(-) diff --git a/subversion-DESTDIR.patch b/subversion-DESTDIR.patch index c6c16d9..0a0b2ca 100644 --- a/subversion-DESTDIR.patch +++ b/subversion-DESTDIR.patch @@ -20,12 +20,12 @@ --- 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 @@ +@@ -131,7 +131,7 @@ $([target.varname]_OBJECTS): $([target.v ######################################## [for areas] 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) +-[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.pc_installdir] $(DESTDIR)[areas.files.pc_installdir][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) "$(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)[if-any areas.files.pc_installdir] $(DESTDIR)[areas.files.pc_installdir][end] [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) + [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] + [if-any areas.files.pc_fullname]$(INSTALL_DATA) [areas.files.pc_fullname] $(DESTDIR)[areas.files.pc_install_fname][end][end][end] diff --git a/subversion.spec b/subversion.spec index 30f4962..b8e9f1e 100644 --- a/subversion.spec +++ b/subversion.spec @@ -49,12 +49,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.8.13 +Version: 1.9.0 Release: 1 License: Apache v2.0 Group: Development/Version Control Source0: http://www.apache.org/dist/subversion/%{name}-%{version}.tar.bz2 -# Source0-md5: 4413417b529d7bdf82f74e50df02e88b +# Source0-md5: 20ae7b0d4ef07eeaf73eb4e23317b495 Source1: %{name}-dav_svn.conf Source2: %{name}-authz_svn.conf Source3: %{name}-svnserve.init @@ -68,7 +68,7 @@ Patch1: %{name}-DESTDIR.patch Patch2: %{name}-ruby-datadir-path.patch Patch3: %{name}-tests.patch URL: http://subversion.apache.org/ -%{?with_apache:BuildRequires: apache-devel >= 2.2.0-8} +%{?with_apache:BuildRequires: apache-devel >= 2.4.14} BuildRequires: apr-devel >= 1:1.0.0 BuildRequires: apr-util-devel >= 1:1.2.8-3 BuildRequires: autoconf >= 2.59 @@ -123,7 +123,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 @@ -757,6 +757,8 @@ 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.*.*.* @@ -783,6 +785,7 @@ 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_serf-1.so @@ -799,6 +802,7 @@ 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_serf-1.la @@ -806,6 +810,23 @@ fi %{_libdir}/libsvn_repos-1.la %{_libdir}/libsvn_subr-1.la %{_libdir}/libsvn_wc-1.la +%{_npkgconfigdir}/libsvn_client.pc +%{_npkgconfigdir}/libsvn_delta.pc +%{_npkgconfigdir}/libsvn_diff.pc +%{_npkgconfigdir}/libsvn_fs.pc +%if %{without net_client_only} +%{_npkgconfigdir}/libsvn_fs_base.pc +%endif +%{_npkgconfigdir}/libsvn_fs_fs.pc +%{_npkgconfigdir}/libsvn_fs_util.pc +%{_npkgconfigdir}/libsvn_fs_x.pc +%{_npkgconfigdir}/libsvn_ra.pc +%{_npkgconfigdir}/libsvn_ra_local.pc +%{_npkgconfigdir}/libsvn_ra_serf.pc +%{_npkgconfigdir}/libsvn_ra_svn.pc +%{_npkgconfigdir}/libsvn_repos.pc +%{_npkgconfigdir}/libsvn_subr.pc +%{_npkgconfigdir}/libsvn_wc.pc %{_includedir}/%{name}-1 %{_examplesdir}/%{name}-%{version} @@ -820,6 +841,7 @@ 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_serf-1.a @@ -866,21 +888,20 @@ fi %attr(755,root,root) %{_bindir}/svndiff4 # tools/server-side -%attr(755,root,root) %{_bindir}/fsfs-stats +%attr(755,root,root) %{_bindir}/svnfsfs %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 %attr(755,root,root) %{_bindir}/svnauthz-validate # tools/client-side -%attr(755,root,root) %{_bindir}/svn-bench +%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}/fsfs-reorg +%attr(755,root,root) %{_bindir}/x509-parser %files -n bash-completion-subversion %defattr(644,root,root,755) -- 2.44.0