From b92333397bfde7b0dfef28eba0f419a13282562e Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Fri, 1 Nov 2019 08:00:12 +0000 Subject: [PATCH 01/13] subversion.spec - update to 1.13.0 --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index a48c57a..3b6a736 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (subversion-1.12.2.tar.bz2) = b1f859b460afa54598778d8633f648acb4fa46138f7d6f0c1451e3c6a1de71df859233cd9ac7f19f0f20d7237ed3988f0a38da7552ffa58391e19d957bc7c136 +SHA512 (subversion-1.13.0.tar.bz2) = 36f390b412bf772bf894efc2aadc247f12ca30ac407e04f664c14411c3519e1bb242d1239f2f44cbcb86eafc7c413efc8eadbfe1d1e75118235a7b7adc6c85b2 From df7a8d43022c64af1dbd38182db2df9aec84cc28 Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Fri, 1 Nov 2019 08:00:29 +0000 Subject: [PATCH 02/13] update to 1.13.0 --- subversion.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/subversion.spec b/subversion.spec index 7933add..e3d10cc 100644 --- a/subversion.spec +++ b/subversion.spec @@ -44,8 +44,8 @@ Summary: A Modern Concurrent Version Control System Name: subversion -Version: 1.12.2 -Release: 2%{?dist} +Version: 1.13.0 +Release: 1%{?dist} License: ASL 2.0 URL: https://subversion.apache.org/ @@ -532,6 +532,9 @@ make check-javahl %endif %changelog +* Wed Oct 30 2019 Joe Orton - 1.13.0-1 +- update to 1.13.0 + * Fri Aug 30 2019 Joe Orton - 1.12.2-2 - switch to Python 3 for F32+ (#1737928) From 37f54c869d14ec5f3c25e0ba6911da6cae082e99 Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Thu, 28 Nov 2019 12:41:27 +0000 Subject: [PATCH 03/13] Tweak issue links. --- clog2markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clog2markdown b/clog2markdown index 4105ed9..938953d 100755 --- a/clog2markdown +++ b/clog2markdown @@ -11,7 +11,7 @@ sed -n " /^Version $1/,/^Version /{ /, from \/branches/d; /repos\/asf\/subversion\/tags/d; -s,#\([0-9]*\),[issue \1](https://issues.apache.org/jira/browse/SVN-\1),; +s,#\([0-9]*\),[SVN-\1](https://issues.apache.org/jira/browse/SVN-\1),; s/(r[0-9, retal]+)\*//g; s/^ *//; s/ +/ /g; From fb7f2749f3bfbc2941947a9299b2a09f8e1d6389 Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Mon, 6 Jan 2020 08:24:17 +0000 Subject: [PATCH 04/13] update for KDE 5 (Phil O, #1768693) Resolves: rhbz#1768693 --- subversion.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/subversion.spec b/subversion.spec index e3d10cc..51f8f16 100644 --- a/subversion.spec +++ b/subversion.spec @@ -45,7 +45,7 @@ Summary: A Modern Concurrent Version Control System Name: subversion Version: 1.13.0 -Release: 1%{?dist} +Release: 2%{?dist} License: ASL 2.0 URL: https://subversion.apache.org/ @@ -151,7 +151,8 @@ passwords in the GNOME Keyring. %package kde Summary: KDE Wallet support for Subversion Requires: subversion%{?_isa} = %{version}-%{release} -BuildRequires: kdelibs-devel >= 4.0.0 +BuildRequires: qt5-devel >= 5.0.0, kf5-kwallet-devel, kf5-ki18n-devel +BuildRequires: kf5-kcoreaddons-devel %description kde The subversion-kde package adds support for storing Subversion @@ -261,7 +262,7 @@ export CC=gcc CXX=g++ JAVA_HOME=%{jdk_path} --with-junit=%{_prefix}/share/java/junit.jar \ %endif %if %{with kwallet} - --with-kwallet=%{_includedir}/kde4:%{_libdir}/kde4/devel \ + --with-kwallet=%{_includedir}:%{_libdir} \ %endif %if %{with bdb} --with-berkeley-db \ @@ -532,6 +533,9 @@ make check-javahl %endif %changelog +* Mon Jan 6 2020 Joe Orton - 1.13.0-2 +- update for KDE 5 (Phil O, #1768693) + * Wed Oct 30 2019 Joe Orton - 1.13.0-1 - update to 1.13.0 From 4dacd0cc9a0a7a7ebdcb6b689ede41d69ed3b850 Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Fri, 17 Jan 2020 09:11:22 +0000 Subject: [PATCH 05/13] conditionally package bdb tools in -tools --- subversion.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/subversion.spec b/subversion.spec index 51f8f16..e50cef1 100644 --- a/subversion.spec +++ b/subversion.spec @@ -466,7 +466,10 @@ make check-javahl %{_prefix}/lib/tmpfiles.d/svnserve.conf %files tools -f tools.files -%doc tools/hook-scripts tools/backup tools/bdb tools/examples tools/xslt +%doc tools/hook-scripts tools/backup tools/examples tools/xslt +%if %{with bdb} +%doc tools/bdb +%endif %files libs %{!?_licensedir:%global license %%doc} @@ -535,6 +538,7 @@ make check-javahl %changelog * Mon Jan 6 2020 Joe Orton - 1.13.0-2 - update for KDE 5 (Phil O, #1768693) +- conditionally package bdb tools in -tools * Wed Oct 30 2019 Joe Orton - 1.13.0-1 - update to 1.13.0 From 3bff10eb40bc43bac9f17ef485fe8adf50e06581 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 21 Jan 2020 15:11:37 +0900 Subject: [PATCH 06/13] F-32: fix include path for ruby 2.7 --- subversion.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/subversion.spec b/subversion.spec index e50cef1..69fbbd7 100644 --- a/subversion.spec +++ b/subversion.spec @@ -45,7 +45,7 @@ Summary: A Modern Concurrent Version Control System Name: subversion Version: 1.13.0 -Release: 2%{?dist} +Release: 3%{?dist} License: ASL 2.0 URL: https://subversion.apache.org/ @@ -241,6 +241,10 @@ perl -pi -e 's|/usr/bin/env python.*|%{svn_python}|' subversion/tests/cmdline/sv export svn_cv_ruby_link="%{__cc} -shared" export svn_cv_ruby_sitedir_libsuffix="" export svn_cv_ruby_sitedir_archsuffix="" +%if 0%{?fedora} >= 32 +# Fix include path for ruby2.7 +export svn_cv_ruby_includes="-I%{_includedir}" +%endif #export EXTRA_CFLAGS="$RPM_OPT_FLAGS -DSVN_SQLITE_MIN_VERSION_NUMBER=3007012 \ # -DSVN_SQLITE_MIN_VERSION=\\\"3.7.12\\\"" @@ -536,6 +540,9 @@ make check-javahl %endif %changelog +* Mon Jan 6 2020 Joe Orton - 1.13.0-3 +- F-32: fix include path for ruby 2.7 (Mamoru TASAKA) + * Mon Jan 6 2020 Joe Orton - 1.13.0-2 - update for KDE 5 (Phil O, #1768693) - conditionally package bdb tools in -tools From 7cd62e93ad6706b7f2314bcd25de1484f5aa0b5d Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Wed, 12 Feb 2020 13:43:04 +0000 Subject: [PATCH 07/13] - fix FTBFS on 32-bit arches --- subversion-1.12.2-fsfspacktest.patch | 26 ++++++++++++++++++++++++++ subversion.spec | 7 ++++++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 subversion-1.12.2-fsfspacktest.patch diff --git a/subversion-1.12.2-fsfspacktest.patch b/subversion-1.12.2-fsfspacktest.patch new file mode 100644 index 0000000..ba5e0fa --- /dev/null +++ b/subversion-1.12.2-fsfspacktest.patch @@ -0,0 +1,26 @@ + +get_rev_contents() has signed integer overflow with "long int" rev +and behaves unpredictably. + +--- subversion-1.12.2/subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c.fsfspacktest ++++ subversion-1.12.2/subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c +@@ -59,7 +59,8 @@ + get_rev_contents(svn_revnum_t rev, apr_pool_t *pool) + { + /* Toss in a bunch of magic numbers for spice. */ +- apr_int64_t num = ((rev * 1234353 + 4358) * 4583 + ((rev % 4) << 1)) / 42; ++ apr_int64_t rev64 = rev; ++ apr_int64_t num = ((rev64 * 1234353 + 4358) * 4583 + ((rev64 % 4) << 1)) / 42; + return apr_psprintf(pool, "%" APR_INT64_T_FMT "\n", num); + } + +@@ -407,7 +408,8 @@ + + if (! svn_stringbuf_compare(rstring, sb)) + return svn_error_createf(SVN_ERR_FS_GENERAL, NULL, +- "Bad data in revision %ld.", i); ++ "Bad data in revision %ld - [%s] not [%s].", ++ i, rstring->data, sb->data); + } + + return SVN_NO_ERROR; diff --git a/subversion.spec b/subversion.spec index 69fbbd7..0e4ca95 100644 --- a/subversion.spec +++ b/subversion.spec @@ -45,7 +45,7 @@ Summary: A Modern Concurrent Version Control System Name: subversion Version: 1.13.0 -Release: 3%{?dist} +Release: 4%{?dist} License: ASL 2.0 URL: https://subversion.apache.org/ @@ -61,6 +61,7 @@ Patch1: subversion-1.12.0-linking.patch Patch2: subversion-1.12.2-py3tests.patch Patch4: subversion-1.8.0-rubybind.patch Patch5: subversion-1.8.5-swigplWall.patch +Patch7: subversion-1.12.2-fsfspacktest.patch BuildRequires: autoconf, libtool, texinfo, which BuildRequires: swig >= 1.3.24, gettext %if %{with bdb} @@ -219,6 +220,7 @@ This package includes supplementary tools for use with Subversion. %endif %patch4 -p1 -b .rubybind %patch5 -p1 -b .swigplWall +%patch7 -p1 -b .fsfspacktest %build # Regenerate the buildsystem, so that: @@ -540,6 +542,9 @@ make check-javahl %endif %changelog +* Wed Feb 12 2020 Joe Orton - 1.13.0-4 +- fix FTBFS on 32-bit arches + * Mon Jan 6 2020 Joe Orton - 1.13.0-3 - F-32: fix include path for ruby 2.7 (Mamoru TASAKA) From 60ad19a1c4bdba1c53fe999e72aab884d27511f1 Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Thu, 23 Apr 2020 16:51:19 +0100 Subject: [PATCH 08/13] update to 1.14.0-rc2 --- sources | 2 +- subversion-1.12.2-fsfspacktest.patch | 26 ---------------- subversion-1.12.2-py3tests.patch | 44 ---------------------------- subversion.spec | 17 +++++------ 4 files changed, 8 insertions(+), 81 deletions(-) delete mode 100644 subversion-1.12.2-fsfspacktest.patch delete mode 100644 subversion-1.12.2-py3tests.patch diff --git a/sources b/sources index 3b6a736..27c986f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (subversion-1.13.0.tar.bz2) = 36f390b412bf772bf894efc2aadc247f12ca30ac407e04f664c14411c3519e1bb242d1239f2f44cbcb86eafc7c413efc8eadbfe1d1e75118235a7b7adc6c85b2 +SHA512 (subversion-1.14.0-rc2.tar.bz2) = 149e961939bf12aafa8b545b3bd1713dfee95d05134b500a8e4279cd1719528f13ff4fdda7ed77ce74630dbd2390f9c7cfcd0a0595f92d95c4ba914f8bd3a76c diff --git a/subversion-1.12.2-fsfspacktest.patch b/subversion-1.12.2-fsfspacktest.patch deleted file mode 100644 index ba5e0fa..0000000 --- a/subversion-1.12.2-fsfspacktest.patch +++ /dev/null @@ -1,26 +0,0 @@ - -get_rev_contents() has signed integer overflow with "long int" rev -and behaves unpredictably. - ---- subversion-1.12.2/subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c.fsfspacktest -+++ subversion-1.12.2/subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c -@@ -59,7 +59,8 @@ - get_rev_contents(svn_revnum_t rev, apr_pool_t *pool) - { - /* Toss in a bunch of magic numbers for spice. */ -- apr_int64_t num = ((rev * 1234353 + 4358) * 4583 + ((rev % 4) << 1)) / 42; -+ apr_int64_t rev64 = rev; -+ apr_int64_t num = ((rev64 * 1234353 + 4358) * 4583 + ((rev64 % 4) << 1)) / 42; - return apr_psprintf(pool, "%" APR_INT64_T_FMT "\n", num); - } - -@@ -407,7 +408,8 @@ - - if (! svn_stringbuf_compare(rstring, sb)) - return svn_error_createf(SVN_ERR_FS_GENERAL, NULL, -- "Bad data in revision %ld.", i); -+ "Bad data in revision %ld - [%s] not [%s].", -+ i, rstring->data, sb->data); - } - - return SVN_NO_ERROR; diff --git a/subversion-1.12.2-py3tests.patch b/subversion-1.12.2-py3tests.patch deleted file mode 100644 index e526141..0000000 --- a/subversion-1.12.2-py3tests.patch +++ /dev/null @@ -1,44 +0,0 @@ - -Fix tests for Python 3. - ---- subversion-1.12.2/subversion/tests/cmdline/svnadmin_tests.py.py3tests -+++ subversion-1.12.2/subversion/tests/cmdline/svnadmin_tests.py -@@ -3859,7 +3859,7 @@ - sbox.repo_url) - - dump_lines = svntest.actions.run_and_verify_dump(sbox.repo_dir) -- assert propval + '\n' in dump_lines -+ assert bytes(propval, 'utf-8') + b'\n' in dump_lines - - def check_recover_prunes_rep_cache(sbox, enable_rep_sharing): - """Check 'recover' prunes the rep-cache while enable-rep-sharing is ---- subversion-1.12.2/subversion/tests/cmdline/svntest/verify.py.py3tests -+++ subversion-1.12.2/subversion/tests/cmdline/svntest/verify.py -@@ -135,11 +135,17 @@ - actual = [actual] - - if self.match_all: -+ if len(expected) and len(actual) \ -+ and type(actual[0]) is bytes and type(expected[0]) is str: -+ actual = [a.decode('utf-8') for a in actual] - return expected == actual - - i_expected = 0 - for actual_line in actual: -- if expected[i_expected] == actual_line: -+ expected_line = expected[i_expected] -+ if type(actual_line) is bytes and type(expected_line) is str: -+ actual_line == actual_line.decode('utf-8') -+ if expected_line == actual_line: - i_expected += 1 - if i_expected == len(expected): - return True -@@ -475,6 +481,8 @@ - if actual is not None: - logger.warn('ACTUAL %s:', actual_label) - for x in actual: -+ if type(x) == bytes: -+ x = x.decode("utf-8") - logger.warn('| ' + x.rstrip()) - - def compare_and_display_lines(message, label, expected, actual, diff --git a/subversion.spec b/subversion.spec index 0e4ca95..cacfa1e 100644 --- a/subversion.spec +++ b/subversion.spec @@ -44,12 +44,12 @@ Summary: A Modern Concurrent Version Control System Name: subversion -Version: 1.13.0 -Release: 4%{?dist} +Version: 1.14.0~rc2 +Release: 0%{?dist} License: ASL 2.0 URL: https://subversion.apache.org/ -Source0: https://www.apache.org/dist/subversion/subversion-%{version}.tar.bz2 +Source0: https://downloads.apache.org/dist/subversion/subversion-1.14.0-rc2.tar.bz2 Source1: subversion.conf Source3: filter-requires.sh Source4: http://www.xsteve.at/prg/emacs/psvn.el @@ -58,10 +58,8 @@ Source6: svnserve.service Source7: svnserve.tmpfiles Source8: svnserve.sysconf Patch1: subversion-1.12.0-linking.patch -Patch2: subversion-1.12.2-py3tests.patch Patch4: subversion-1.8.0-rubybind.patch Patch5: subversion-1.8.5-swigplWall.patch -Patch7: subversion-1.12.2-fsfspacktest.patch BuildRequires: autoconf, libtool, texinfo, which BuildRequires: swig >= 1.3.24, gettext %if %{with bdb} @@ -213,14 +211,10 @@ Requires: subversion%{?_isa} = %{version}-%{release} This package includes supplementary tools for use with Subversion. %prep -%setup -q +%setup -q -n subversion-1.14.0-rc2 %patch1 -p1 -b .linking -%if %{with python3} -%patch2 -p1 -b .py3tests -%endif %patch4 -p1 -b .rubybind %patch5 -p1 -b .swigplWall -%patch7 -p1 -b .fsfspacktest %build # Regenerate the buildsystem, so that: @@ -542,6 +536,9 @@ make check-javahl %endif %changelog +* Thu Apr 23 2020 Joe Orton - 1.14.0~rc2-0 +- update to 1.14.0-rc2 + * Wed Feb 12 2020 Joe Orton - 1.13.0-4 - fix FTBFS on 32-bit arches From 3751cb1185c7a5164567df3881307a6fbc7f8d54 Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Fri, 24 Apr 2020 11:25:11 +0100 Subject: [PATCH 09/13] - BR py3c-devel --- subversion.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/subversion.spec b/subversion.spec index cacfa1e..9b5eb7a 100644 --- a/subversion.spec +++ b/subversion.spec @@ -121,7 +121,7 @@ Subversion libraries. %package -n python3-subversion %{?python_provide:%python_provide python3-subversion} Summary: Python bindings for Subversion Version Control system -BuildRequires: python3-devel +BuildRequires: python3-devel py3c-devel %description -n python3-subversion The python3-subversion package includes the Python 3.x bindings to the From dba71be6b7821a4162676628c07e3c1ab8016ddd Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Tue, 28 Apr 2020 17:19:16 +0100 Subject: [PATCH 10/13] Fix for -rc --- clog2markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clog2markdown b/clog2markdown index 938953d..0acb69e 100755 --- a/clog2markdown +++ b/clog2markdown @@ -8,7 +8,7 @@ echo curl --silent -n "http://svn.apache.org/repos/asf/subversion/tags/$1/CHANGES" | \ sed -n " /^#/d; -/^Version $1/,/^Version /{ +/^Version ${1/-rc*/}/,/^Version /{ /, from \/branches/d; /repos\/asf\/subversion\/tags/d; s,#\([0-9]*\),[SVN-\1](https://issues.apache.org/jira/browse/SVN-\1),; From 15003a7b63c931021d304f3f2afc829a89b3e8c9 Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Thu, 30 Apr 2020 09:51:47 +0100 Subject: [PATCH 11/13] drop Berkeley DB support for Fedora > 32 BR java-11-openjdk-devel --- subversion.spec | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/subversion.spec b/subversion.spec index 9b5eb7a..287641a 100644 --- a/subversion.spec +++ b/subversion.spec @@ -1,9 +1,14 @@ # set to zero to avoid running test suite %bcond_without kwallet -%bcond_without bdb %bcond_without tests +%if 0%{?fedora} > 32 || 0%{?rhel} > 8 +%bcond_with bdb +%else +%bcond_without bdb +%endif + # Python 2 for F<32, Python 3 for F>=32 %if 0%{?fedora} < 32 %bcond_without python2 @@ -45,7 +50,7 @@ Summary: A Modern Concurrent Version Control System Name: subversion Version: 1.14.0~rc2 -Release: 0%{?dist} +Release: 1%{?dist} License: ASL 2.0 URL: https://subversion.apache.org/ @@ -182,7 +187,7 @@ This package includes the Perl bindings to the Subversion libraries. %package javahl Summary: JNI bindings to the Subversion libraries Requires: subversion = %{version}-%{release} -BuildRequires: java-devel-openjdk +BuildRequires: java-11-openjdk-devel # JAR repacking requires both zip and unzip in the buildroot BuildRequires: zip, unzip # For the tests @@ -536,6 +541,10 @@ make check-javahl %endif %changelog +* Thu Apr 30 2020 Joe Orton - 1.14.0~rc2-1 +- drop Berkeley DB support for Fedora > 32 +- BR java-11-openjdk-devel + * Thu Apr 23 2020 Joe Orton - 1.14.0~rc2-0 - update to 1.14.0-rc2 From 880dc2d0887217c15cf7f1b8d8198ee4fe689155 Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Tue, 19 May 2020 10:52:49 +0100 Subject: [PATCH 12/13] switch subpackages to lock-step requires on -libs rather than subversion --- subversion.spec | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/subversion.spec b/subversion.spec index 287641a..587bf71 100644 --- a/subversion.spec +++ b/subversion.spec @@ -50,7 +50,7 @@ Summary: A Modern Concurrent Version Control System Name: subversion Version: 1.14.0~rc2 -Release: 1%{?dist} +Release: 2%{?dist} License: ASL 2.0 URL: https://subversion.apache.org/ @@ -135,7 +135,7 @@ Subversion libraries. %package devel Summary: Development package for the Subversion libraries -Requires: subversion%{?_isa} = %{version}-%{release} +Requires: subversion-libs%{?_isa} = %{version}-%{release} Requires: apr-devel%{?_isa}, apr-util-devel%{?_isa} %description devel @@ -144,7 +144,7 @@ for developers interacting with the subversion package. %package gnome Summary: GNOME Keyring support for Subversion -Requires: subversion%{?_isa} = %{version}-%{release} +Requires: subversion-libs%{?_isa} = %{version}-%{release} BuildRequires: dbus-devel, libsecret-devel %description gnome @@ -154,7 +154,7 @@ passwords in the GNOME Keyring. %if %{with kwallet} %package kde Summary: KDE Wallet support for Subversion -Requires: subversion%{?_isa} = %{version}-%{release} +Requires: subversion-libs%{?_isa} = %{version}-%{release} BuildRequires: qt5-devel >= 5.0.0, kf5-kwallet-devel, kf5-ki18n-devel BuildRequires: kf5-kcoreaddons-devel @@ -178,7 +178,7 @@ Summary: Perl bindings to the Subversion libraries BuildRequires: perl-devel >= 2:5.8.0, perl-generators, perl(ExtUtils::MakeMaker) BuildRequires: perl(Test::More), perl(ExtUtils::Embed) Requires: %(eval `perl -V:version`; echo "perl(:MODULE_COMPAT_$version)") -Requires: subversion%{?_isa} = %{version}-%{release} +Requires: subversion-libs%{?_isa} = %{version}-%{release} %description perl This package includes the Perl bindings to the Subversion libraries. @@ -202,7 +202,7 @@ This package includes the JNI bindings to the Subversion libraries. Summary: Ruby bindings to the Subversion libraries BuildRequires: ruby-devel >= 1.9.1, ruby >= 1.9.1 BuildRequires: rubygem(test-unit) -Requires: subversion%{?_isa} = %{version}-%{release} +Requires: subversion-libs%{?_isa} = %{version}-%{release} Conflicts: ruby-libs%{?_isa} < 1.8.2 %description ruby @@ -210,7 +210,7 @@ This package includes the Ruby bindings to the Subversion libraries. %package tools Summary: Supplementary tools for Subversion -Requires: subversion%{?_isa} = %{version}-%{release} +Requires: subversion-libs%{?_isa} = %{version}-%{release} %description tools This package includes supplementary tools for use with Subversion. @@ -541,6 +541,9 @@ make check-javahl %endif %changelog +* Tue May 19 2020 Joe Orton - 1.14.0~rc2-2 +- switch subpackages to lock-step requires on -libs rather than subversion + * Thu Apr 30 2020 Joe Orton - 1.14.0~rc2-1 - drop Berkeley DB support for Fedora > 32 - BR java-11-openjdk-devel From 8ee227cefce1e47ed7e5084c6004bdb0e3d86513 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Tue, 28 Apr 2020 08:10:16 +0200 Subject: [PATCH 13/13] Updated build-requires for java and qt5 Switch back to java-11. --- subversion.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/subversion.spec b/subversion.spec index 587bf71..79ed801 100644 --- a/subversion.spec +++ b/subversion.spec @@ -155,7 +155,7 @@ passwords in the GNOME Keyring. %package kde Summary: KDE Wallet support for Subversion Requires: subversion-libs%{?_isa} = %{version}-%{release} -BuildRequires: qt5-devel >= 5.0.0, kf5-kwallet-devel, kf5-ki18n-devel +BuildRequires: qt5-qtbase-devel >= 5.0.0, kf5-kwallet-devel, kf5-ki18n-devel BuildRequires: kf5-kcoreaddons-devel %description kde @@ -543,6 +543,7 @@ make check-javahl %changelog * Tue May 19 2020 Joe Orton - 1.14.0~rc2-2 - switch subpackages to lock-step requires on -libs rather than subversion +- fixed the build-requires (Jitka Plesnikova) * Thu Apr 30 2020 Joe Orton - 1.14.0~rc2-1 - drop Berkeley DB support for Fedora > 32