diff --git a/_multibuild b/_multibuild new file mode 100644 index 0000000..964176c --- /dev/null +++ b/_multibuild @@ -0,0 +1,3 @@ + + testsuite + diff --git a/disable-fs-fs-pack-test.patch b/disable-fs-fs-pack-test.patch index 8d99beb..2c3c52b 100644 --- a/disable-fs-fs-pack-test.patch +++ b/disable-fs-fs-pack-test.patch @@ -1,8 +1,8 @@ -diff --git a/build.conf b/build.conf -index 7631a61..f9551f0 100644 ---- a/build.conf -+++ b/build.conf -@@ -805,15 +805,6 @@ msvc-force-static = yes +Index: subversion-1.14.2/build.conf +=================================================================== +--- subversion-1.14.2.orig/build.conf ++++ subversion-1.14.2/build.conf +@@ -806,15 +806,6 @@ msvc-force-static = yes # ---------------------------------------------------------------------------- # Tests for libsvn_fs_fs diff --git a/gcc10-do-not-optimize-get_externals_to_pin.patch b/gcc10-do-not-optimize-get_externals_to_pin.patch index a0b1ec6..bfd3a02 100644 --- a/gcc10-do-not-optimize-get_externals_to_pin.patch +++ b/gcc10-do-not-optimize-get_externals_to_pin.patch @@ -1,7 +1,7 @@ -diff --git a/subversion/bindings/javahl/native/SVNClient.cpp b/subversion/bindings/javahl/native/SVNClient.cpp -index 2c83f56..f1c8b02 100644 ---- a/subversion/bindings/javahl/native/SVNClient.cpp -+++ b/subversion/bindings/javahl/native/SVNClient.cpp +Index: subversion-1.14.2/subversion/bindings/javahl/native/SVNClient.cpp +=================================================================== +--- subversion-1.14.2.orig/subversion/bindings/javahl/native/SVNClient.cpp ++++ subversion-1.14.2/subversion/bindings/javahl/native/SVNClient.cpp @@ -77,10 +77,13 @@ #include "private/svn_subr_private.h" #include "svn_private_config.h" diff --git a/subversion-1.10.2-javadoc.patch b/subversion-1.10.2-javadoc.patch index 19d37ba..597e87c 100644 --- a/subversion-1.10.2-javadoc.patch +++ b/subversion-1.10.2-javadoc.patch @@ -1,6 +1,8 @@ ---- subversion-1.10.2/Makefile.in 2018-02-16 05:00:12.000000000 +0100 -+++ subversion-1.10.2/Makefile.in 2018-09-11 10:55:03.062316623 +0200 -@@ -721,7 +721,6 @@ +Index: subversion-1.14.2/Makefile.in +=================================================================== +--- subversion-1.14.2.orig/Makefile.in ++++ subversion-1.14.2/Makefile.in +@@ -738,7 +738,6 @@ doc-api: mkdir-init doc-javahl: $(JAVADOC) -d $(abs_builddir)/doc/javadoc \ -sourcepath $(top_srcdir)/subversion/bindings/javahl/src \ diff --git a/subversion-1.8.0-rpath.patch b/subversion-1.8.0-rpath.patch index b8ce6dc..bdedeb8 100644 --- a/subversion-1.8.0-rpath.patch +++ b/subversion-1.8.0-rpath.patch @@ -12,11 +12,11 @@ patch by David Kimdon . The basic theory is: build/generator/gen_base.py | 3 ++- 3 files changed, 11 insertions(+), 8 deletions(-) -Index: subversion-1.12.0/Makefile.in +Index: subversion-1.14.2/Makefile.in =================================================================== ---- subversion-1.12.0.orig/Makefile.in -+++ subversion-1.12.0/Makefile.in -@@ -268,10 +268,10 @@ TEST_SHLIB_VAR_SWIG_RB=\ +--- subversion-1.14.2.orig/Makefile.in ++++ subversion-1.14.2/Makefile.in +@@ -272,10 +272,10 @@ TEST_SHLIB_VAR_SWIG_RB=\ COMPILE_SVNXX = $(LT_COMPILE_CXX) $(SVNXX_INCLUDES) -o $@ -c COMPILE_SVNXX_TEST = $(LT_COMPILE_CXX) $(SVNXX_INCLUDES) $(BOOST_TEST_CPPFLAGS) -o $@ -c @@ -31,7 +31,7 @@ Index: subversion-1.12.0/Makefile.in LINK_SVNXX_TEST = $(LINK_CXX) $(BOOST_TEST_LDFLAGS) # special link rule for mod_dav_svn -@@ -876,7 +876,9 @@ $(SWIG_PL_DIR)/native/Makefile.PL: $(SWI +@@ -880,7 +880,9 @@ $(SWIG_PL_DIR)/native/Makefile.PL: $(SWI ./config.status subversion/bindings/swig/perl/native/Makefile.PL $(SWIG_PL_DIR)/native/Makefile: libsvn_swig_perl $(SWIG_PL_DIR)/native/Makefile.PL @@ -42,11 +42,11 @@ Index: subversion-1.12.0/Makefile.in # There is a "readlink -f" command on some systems for the same purpose, # but it's not as portable (e.g. Mac OS X doesn't have it). These should -Index: subversion-1.12.0/build.conf +Index: subversion-1.14.2/build.conf =================================================================== ---- subversion-1.12.0.orig/build.conf -+++ subversion-1.12.0/build.conf -@@ -572,7 +572,7 @@ lang = python +--- subversion-1.14.2.orig/build.conf ++++ subversion-1.14.2/build.conf +@@ -573,7 +573,7 @@ lang = python path = subversion/bindings/swig/python/libsvn_swig_py libs = libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_subr apriconv apr python swig @@ -55,7 +55,7 @@ Index: subversion-1.12.0/build.conf install = swig-py-lib # need special build rule to include -DSWIGPYTHON compile-cmd = $(COMPILE_SWIG_PY) -@@ -598,7 +598,7 @@ type = swig_lib +@@ -599,7 +599,7 @@ type = swig_lib lang = ruby path = subversion/bindings/swig/ruby/libsvn_swig_ruby libs = libsvn_client libsvn_wc libsvn_delta libsvn_subr apriconv apr ruby swig @@ -64,10 +64,10 @@ Index: subversion-1.12.0/build.conf install = swig-rb-lib # need special build rule to include compile-cmd = $(COMPILE_SWIG_RB) -Index: subversion-1.12.0/build/generator/gen_base.py +Index: subversion-1.14.2/build/generator/gen_base.py =================================================================== ---- subversion-1.12.0.orig/build/generator/gen_base.py -+++ subversion-1.12.0/build/generator/gen_base.py +--- subversion-1.14.2.orig/build/generator/gen_base.py ++++ subversion-1.14.2/build/generator/gen_base.py @@ -599,7 +599,7 @@ class TargetLinked(Target): self.install = options.get('install') self.compile_cmd = options.get('compile-cmd') diff --git a/subversion-fix-parallel-build-support-for-perl-bindings.patch b/subversion-fix-parallel-build-support-for-perl-bindings.patch index aae38b9..b518f52 100644 --- a/subversion-fix-parallel-build-support-for-perl-bindings.patch +++ b/subversion-fix-parallel-build-support-for-perl-bindings.patch @@ -2,7 +2,7 @@ Index: Makefile.in =================================================================== --- Makefile.in.orig +++ Makefile.in -@@ -860,7 +860,7 @@ clean-swig-headers: +@@ -876,7 +876,7 @@ clean-swig-headers: extraclean-swig-headers: clean-swig-headers $(EXTRACLEAN_SWIG_HEADERS) diff --git a/subversion-perl-underlinking.patch b/subversion-perl-underlinking.patch index 02e4db5..ad46d6f 100644 --- a/subversion-perl-underlinking.patch +++ b/subversion-perl-underlinking.patch @@ -1,8 +1,8 @@ -Index: subversion-1.10.0-alpha2/Makefile.in +Index: subversion-1.14.2/Makefile.in =================================================================== ---- subversion-1.10.0-alpha2.orig/Makefile.in 2017-02-24 15:57:25.605638431 +0100 -+++ subversion-1.10.0-alpha2/Makefile.in 2017-02-24 15:57:25.617638527 +0100 -@@ -865,7 +865,7 @@ swig-pl: $(swig-pl_DEPS) +--- subversion-1.14.2.orig/Makefile.in ++++ subversion-1.14.2/Makefile.in +@@ -898,7 +898,7 @@ swig-pl: autogen-swig-pl $(SWIG_PL_DIR)/ fi; \ done; \ fi @@ -11,10 +11,10 @@ Index: subversion-1.10.0-alpha2/Makefile.in check-swig-pl: swig-pl swig-pl-lib cd $(SWIG_PL_DIR)/native; $(MAKE) test -Index: subversion-1.10.0-alpha2/subversion/bindings/swig/perl/native/Makefile.PL.in +Index: subversion-1.14.2/subversion/bindings/swig/perl/native/Makefile.PL.in =================================================================== ---- subversion-1.10.0-alpha2.orig/subversion/bindings/swig/perl/native/Makefile.PL.in 2017-02-24 15:57:25.561638078 +0100 -+++ subversion-1.10.0-alpha2/subversion/bindings/swig/perl/native/Makefile.PL.in 2017-02-24 15:57:25.617638527 +0100 +--- subversion-1.14.2.orig/subversion/bindings/swig/perl/native/Makefile.PL.in ++++ subversion-1.14.2/subversion/bindings/swig/perl/native/Makefile.PL.in @@ -85,7 +85,7 @@ my %config = ( " -I$svnlib_builddir", " -I$swig_srcdir -g"), diff --git a/subversion-pkgconfig.patch b/subversion-pkgconfig.patch index f2205e6..256f56c 100644 --- a/subversion-pkgconfig.patch +++ b/subversion-pkgconfig.patch @@ -1,6 +1,8 @@ ---- a/Makefile.in -+++ b/Makefile.in -@@ -91,7 +91,7 @@ swig_rbdir = $(SWIG_RB_SITE_ARCH_DIR)/sv +Index: subversion-1.14.2/Makefile.in +=================================================================== +--- subversion-1.14.2.orig/Makefile.in ++++ subversion-1.14.2/Makefile.in +@@ -96,7 +96,7 @@ swig_rbdir = $(SWIG_RB_SITE_ARCH_DIR)/sv toolsdir = @bindir@/svn-tools # where to install pkg-config files diff --git a/subversion-swig-perl-Wall.patch b/subversion-swig-perl-Wall.patch index 84bb996..1b8f38e 100644 --- a/subversion-swig-perl-Wall.patch +++ b/subversion-swig-perl-Wall.patch @@ -4,9 +4,11 @@ e.g. -Wformat-security might break. https://bugzilla.redhat.com/show_bug.cgi?id=1037341 ---- subversion-1.8.5/subversion/bindings/swig/perl/native/Makefile.PL.in.swigplWall -+++ subversion-1.8.5/subversion/bindings/swig/perl/native/Makefile.PL.in -@@ -54,7 +54,6 @@ my $includes = ' -I/usr/include/apr-1 +Index: subversion-1.14.2/subversion/bindings/swig/perl/native/Makefile.PL.in +=================================================================== +--- subversion-1.14.2.orig/subversion/bindings/swig/perl/native/Makefile.PL.in ++++ subversion-1.14.2/subversion/bindings/swig/perl/native/Makefile.PL.in +@@ -61,7 +61,6 @@ chomp($cflags); # SWIG is using C++ style comments in an extern "C" code. $cflags =~ s/-ansi\s+//g; $cflags =~ s/-std=c89\s+//g; diff --git a/subversion-swig-perl-install_vendor.patch b/subversion-swig-perl-install_vendor.patch index c53ae09..97a8b91 100644 --- a/subversion-swig-perl-install_vendor.patch +++ b/subversion-swig-perl-install_vendor.patch @@ -1,11 +1,11 @@ Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: subversion-1.8.0-rc2/Makefile.in +Index: subversion-1.14.2/Makefile.in =================================================================== ---- subversion-1.8.0-rc2.orig/Makefile.in 2013-05-14 20:24:53.000000000 +0100 -+++ subversion-1.8.0-rc2/Makefile.in 2013-05-14 20:24:54.000000000 +0100 -@@ -780,7 +780,7 @@ check-swig-pl: swig-pl swig-pl-lib +--- subversion-1.14.2.orig/Makefile.in ++++ subversion-1.14.2/Makefile.in +@@ -902,7 +902,7 @@ check-swig-pl: swig-pl swig-pl-lib cd $(SWIG_PL_DIR)/native; $(MAKE) test install-swig-pl: swig-pl install-swig-pl-lib diff --git a/subversion.changes b/subversion.changes index c708138..233e72a 100644 --- a/subversion.changes +++ b/subversion.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Apr 13 20:55:36 UTC 2022 - Dirk Müller + +- split testsuite into _multibuild flavor to speedup dependent packages + ------------------------------------------------------------------- Tue Apr 12 18:26:25 UTC 2022 - Andreas Stieger diff --git a/subversion.libtool-verbose.patch b/subversion.libtool-verbose.patch index a734300..119c738 100644 --- a/subversion.libtool-verbose.patch +++ b/subversion.libtool-verbose.patch @@ -2,11 +2,11 @@ Makefile.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -Index: subversion-nightly/Makefile.in +Index: subversion-1.14.2/Makefile.in =================================================================== ---- subversion-nightly.orig/Makefile.in 2013-03-15 12:21:46.000000000 +0000 -+++ subversion-nightly/Makefile.in 2013-03-17 20:02:04.000000000 +0000 -@@ -112,8 +112,8 @@ EXEEXT = @EXEEXT@ +--- subversion-1.14.2.orig/Makefile.in ++++ subversion-1.14.2/Makefile.in +@@ -124,8 +124,8 @@ EXEEXT = @EXEEXT@ SHELL = @SHELL@ LIBTOOL = @SVN_LIBTOOL@ diff --git a/subversion.spec b/subversion.spec index 04af9f6..c94b016 100644 --- a/subversion.spec +++ b/subversion.spec @@ -1,5 +1,5 @@ # -# spec file for package subversion +# spec file # # Copyright (c) 2022 SUSE LLC # Copyright (c) 2009-2010 Pascal Bleser @@ -33,13 +33,21 @@ %bcond_without kde %bcond_with python_ctypes %bcond_with all_regression_tests -Name: subversion +%global flavor @BUILD_FLAVOR@%{nil} + +%if "%{flavor}" == "testsuite" +%global psuffix -testsuite +%else +%global psuffix %{nil} +%endif + +Name: subversion%{psuffix} Version: 1.14.2 Release: 0 Summary: Subversion version control system License: Apache-2.0 URL: https://subversion.apache.org -Source0: https://www.apache.org/dist/subversion/%{name}-%{version}.tar.bz2 +Source0: https://www.apache.org/dist/subversion/subversion-%{version}.tar.bz2 Source1: subversion.conf Source2: subversion.README.SUSE Source4: contrib-1804739.tar.bz2 @@ -49,9 +57,9 @@ Source15: svnserve.tmpfiles Source16: svn.sysusers Source42: subversion.svngrep.sh Source43: subversion.svndiff.sh -Source50: https://www.apache.org/dist/subversion/subversion-%{version}.KEYS#/%{name}.keyring -Source51: https://www.apache.org/dist/subversion/%{name}-%{version}.tar.bz2.asc -Source92: %{name}-rpmlintrc +Source50: https://www.apache.org/dist/subversion/subversion-%{version}.KEYS#/subversion.keyring +Source51: https://www.apache.org/dist/subversion/subversion-%{version}.tar.bz2.asc +Source92: subversion-rpmlintrc Patch0: subversion-pkgconfig.patch Patch1: subversion-1.10.2-javadoc.patch Patch11: subversion.libtool-verbose.patch @@ -103,7 +111,7 @@ BuildConflicts: pkgconfig(liblz4) = 124 Requires: libsqlite3-0 >= %{sqlite_minimum_version} Requires(post): %fillup_prereq %sysusers_requires -Recommends: %{name}-bash-completion +Recommends: subversion-bash-completion # workaround for boo#969159 Conflicts: libsvn_auth_kwallet-1-0 < %{version} Conflicts: libsvn_auth_kwallet-1-0 > %{version} @@ -206,7 +214,7 @@ to the Apache directories and configuration. %if %{with kde} %package -n libsvn_auth_kwallet-1-0 Summary: KWallet support for Subversion -Requires: %{name} = %{version} +Requires: subversion = %{version} Supplements: (subversion and kdebase4-workspace) Supplements: (subversion and plasma5-workspace) @@ -217,7 +225,7 @@ Provides KWallet integration for Subversion %if %{with gnome} %package -n libsvn_auth_gnome_keyring-1-0 Summary: GNOME keyring sypport for Subversion -Requires: %{name} = %{version} +Requires: subversion = %{version} Supplements: (subversion and gnome-session) %description -n libsvn_auth_gnome_keyring-1-0 @@ -225,17 +233,17 @@ Provides GNOME keyring support for Subversion %endif %package bash-completion -Summary: Bash Completion for %{name} -Requires: %{name} = %{version} +Summary: Bash Completion for subversion Requires: bash-completion +Requires: subversion = %{version} BuildArch: noarch %description bash-completion -Bash command line completion support for %{name} - completion of subcommands, +Bash command line completion support for subversion - completion of subcommands, parameters and keywords for the svn command and other tools. %prep -%setup -q -a 4 +%setup -q -a 4 -n subversion-%{version} %patch0 -p1 %patch1 -p1 %patch11 -p1 @@ -254,7 +262,7 @@ parameters and keywords for the svn command and other tools. sed -i -e 's#%{_bindir}/env python#%{_bindir}/python3#' subversion/tests/cmdline/*.py %build -%sysusers_generate_pre %{SOURCE16} %{name} system-user-svn.conf +%sysusers_generate_pre %{SOURCE16} subversion system-user-svn.conf # Re-boot strap, needed for patch37 PATH=%{_prefix}/bin:$PATH ./autogen.sh --release @@ -330,6 +338,7 @@ export LDFLAGS="-pie" %make_build -j1 JAVAC_FLAGS=" -encoding iso8859-1" javahl doc-javahl %install +%if "%{flavor}" != "testsuite" %make_install make DESTDIR=%{buildroot} install-swig-py install-swig-pl install-javahl install-swig-rb %if %{with python_ctypes} @@ -340,7 +349,7 @@ find "%{buildroot}%{python_sitelib}/csvn/" -name "*.pyc" | xargs rm -f %endif %perl_process_packlist -%find_lang %{name} +%find_lang subversion cp -Lav %{SOURCE42} %{buildroot}%{_bindir}/svngrep cp -Lav %{SOURCE43} %{buildroot}%{_bindir}/svndiff @@ -356,7 +365,7 @@ cp -av %{SOURCE1} %{buildroot}/%{apache_sysconfdir}/conf.d/subversion.conf cp -avL %{SOURCE2} README.SUSE cp -avL subversion/mod_authz_svn/INSTALL README.mod_authz_svn -cat %{name}.lang > files.subversion +cat subversion.lang > files.subversion cat with_jdk.files >> files.subversion # tools @@ -396,12 +405,12 @@ install -d -m 0755 %{buildroot}/%{_datadir}/java ln -sv %{_libdir}/svn-javahl/svn-javahl.jar %{buildroot}/%{_datadir}/java/svn-javahl.jar rm -f %{buildroot}%{_localstatedir}/adm/perl-modules/subversion -install -D -m0644 tools/client-side/bash_completion %{buildroot}%{_datadir}/bash-completion/completions/%{name} +install -D -m0644 tools/client-side/bash_completion %{buildroot}%{_datadir}/bash-completion/completions/subversion # examples -mkdir -p %{buildroot}%{_docdir}/%{name} -cp -r tools/hook-scripts tools/backup tools/bdb tools/examples tools/xslt %{buildroot}%{_docdir}/%{name} -find %{buildroot}%{_docdir}/%{name} -type f -print0 | xargs -0 chmod 644 +mkdir -p %{buildroot}%{_docdir}/subversion +cp -r tools/hook-scripts tools/backup tools/bdb tools/examples tools/xslt %{buildroot}%{_docdir}/subversion +find %{buildroot}%{_docdir}/subversion -type f -print0 | xargs -0 chmod 644 # clean tools for doc rm -rf tools/*/*.in @@ -409,7 +418,9 @@ rm -rf doc/doxygen/html/installdox # sysusers install -Dm0644 %{SOURCE16} %{buildroot}%{_sysusersdir}/system-user-svn.conf +%endif +%if "%{flavor}" == "testsuite" %check export LANG=C LC_ALL=C @@ -433,7 +444,9 @@ ln -s /dev/shm/svn-test-work subversion/tests/cmdline/ %make_build davautocheck CLEANUP=true FS_TYPE=bdb || (cat fails.log; exit 1) %endif -%pre -f %{name}.pre +%else + +%pre -f subversion.pre %service_add_pre svnserve.service %preun @@ -469,8 +482,8 @@ systemd-tmpfiles --create %{_tmpfilesdir}/svnserve.conf %files -f files.subversion %license LICENSE %doc README.SUSE BUGS CHANGES README.mod_authz_svn -%dir %{_docdir}/%{name}/* -%{_docdir}/%{name} +%dir %{_docdir}/subversion/* +%{_docdir}/subversion %{_sbindir}/rcsvnserve %{_fillupdir}/sysconfig.svnserve %dir %attr(755,%{svnuser},%{svngroup}) /srv/svn @@ -566,6 +579,7 @@ systemd-tmpfiles --create %{_tmpfilesdir}/svnserve.conf %endif %files bash-completion -%{_datadir}/bash-completion/completions/%{name} +%{_datadir}/bash-completion/completions/subversion +%endif %changelog