From 3d5f8d900a066a77c81766ea91fcb3fd49ed0d4e Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Tue, 29 Sep 2020 16:30:15 +0100 Subject: [PATCH 01/24] bump required apr-devel BR gcc, gcc-c++ --- subversion.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/subversion.spec b/subversion.spec index fa52a32..0cec5c9 100644 --- a/subversion.spec +++ b/subversion.spec @@ -52,7 +52,7 @@ Summary: A Modern Concurrent Version Control System Name: subversion Version: 1.14.0 -Release: 6%{?dist} +Release: 7%{?dist} License: ASL 2.0 URL: https://subversion.apache.org/ @@ -69,13 +69,13 @@ Patch2: subversion-1.14.0-testwarn.patch Patch3: subversion-1.14.0-soversion.patch Patch4: subversion-1.8.0-rubybind.patch Patch5: subversion-1.8.5-swigplWall.patch -BuildRequires: autoconf, libtool, texinfo, which +BuildRequires: autoconf, libtool, texinfo, which, gcc, gcc-c++ BuildRequires: swig >= 1.3.24, gettext %if %{with bdb} BuildRequires: libdb-devel >= 4.1.25 %endif BuildRequires: %{svn_python_br} -BuildRequires: apr-devel >= 1.3.0, apr-util-devel >= 1.3.0 +BuildRequires: apr-devel >= 1.5.0, apr-util-devel >= 1.3.0 BuildRequires: libserf-devel >= 1.3.0, cyrus-sasl-devel BuildRequires: sqlite-devel >= 3.4.0, file-devel, systemd-units BuildRequires: utf8proc-devel, lz4-devel @@ -104,7 +104,7 @@ compelling replacement for CVS. %package libs Summary: Libraries for Subversion Version Control system # APR 1.3.x interfaces are required -Conflicts: apr%{?_isa} < 1.3.0 +Conflicts: apr%{?_isa} < 1.5.0 # Enforced at run-time by ra_serf Conflicts: libserf%{?_isa} < 1.3.0 @@ -565,6 +565,10 @@ make check-javahl %endif %changelog +* Tue Sep 29 2020 Joe Orton - 1.14.0-7 +- bump required apr-devel +- BR gcc, gcc-c++ + * Sat Aug 01 2020 Fedora Release Engineering - 1.14.0-6 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From eeb81e6a40c54a811d59363c43c0c3388dd6e564 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Mon, 30 Nov 2020 10:34:21 +0100 Subject: [PATCH 02/24] Disable KWallet for RHEL and ELN Resolves: bz#1902598 --- subversion.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/subversion.spec b/subversion.spec index 0cec5c9..1cd74ae 100644 --- a/subversion.spec +++ b/subversion.spec @@ -1,6 +1,11 @@ # set to zero to avoid running test suite +%if 0%{?rhel} && 0%{?eln} +%bcond_with kwallet +%else %bcond_without kwallet +%endif + %bcond_without tests %if 0%{?fedora} > 32 || 0%{?rhel} > 8 @@ -52,7 +57,7 @@ Summary: A Modern Concurrent Version Control System Name: subversion Version: 1.14.0 -Release: 7%{?dist} +Release: 8%{?dist} License: ASL 2.0 URL: https://subversion.apache.org/ @@ -565,6 +570,10 @@ make check-javahl %endif %changelog +* Mon Nov 30 2020 Jan Grulich - 1.14.0-8 +- Disable KWallet for RHEL and ELN + Resolves: bz#1902598 + * Tue Sep 29 2020 Joe Orton - 1.14.0-7 - bump required apr-devel - BR gcc, gcc-c++ From 499cd8e83d2788804d534a3bedf2e614b1709594 Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Wed, 2 Dec 2020 14:34:32 +0000 Subject: [PATCH 03/24] Reorder bconds. --- subversion.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/subversion.spec b/subversion.spec index 1cd74ae..2eb501f 100644 --- a/subversion.spec +++ b/subversion.spec @@ -1,4 +1,5 @@ # set to zero to avoid running test suite +%bcond_without tests %if 0%{?rhel} && 0%{?eln} %bcond_with kwallet @@ -6,8 +7,6 @@ %bcond_without kwallet %endif -%bcond_without tests - %if 0%{?fedora} > 32 || 0%{?rhel} > 8 %bcond_with bdb %else From fcaaaff855186d439c6963c18daa0b33735ca7ba Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Thu, 3 Dec 2020 10:31:42 +0000 Subject: [PATCH 04/24] fix KWallet conditional (#1902598) Resolves: rhbz#1902598 --- subversion.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/subversion.spec b/subversion.spec index 2eb501f..a9b94aa 100644 --- a/subversion.spec +++ b/subversion.spec @@ -1,7 +1,7 @@ # set to zero to avoid running test suite %bcond_without tests -%if 0%{?rhel} && 0%{?eln} +%if 0%{?rhel} || 0%{?eln} %bcond_with kwallet %else %bcond_without kwallet @@ -56,7 +56,7 @@ Summary: A Modern Concurrent Version Control System Name: subversion Version: 1.14.0 -Release: 8%{?dist} +Release: 9%{?dist} License: ASL 2.0 URL: https://subversion.apache.org/ @@ -569,6 +569,9 @@ make check-javahl %endif %changelog +* Thu Dec 3 2020 Joe Orton - 1.14.0-9 +- fix KWallet conditional (#1902598) + * Mon Nov 30 2020 Jan Grulich - 1.14.0-8 - Disable KWallet for RHEL and ELN Resolves: bz#1902598 From 9e1c54f621b33f3e5cde5a06337f5fd4cbc153e8 Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Fri, 11 Dec 2020 16:58:50 +0000 Subject: [PATCH 05/24] strip libdir from pkgconfig files add missing -libs dep from python3-subversion --- subversion.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/subversion.spec b/subversion.spec index a9b94aa..94a04db 100644 --- a/subversion.spec +++ b/subversion.spec @@ -56,7 +56,7 @@ Summary: A Modern Concurrent Version Control System Name: subversion Version: 1.14.0 -Release: 9%{?dist} +Release: 10%{?dist} License: ASL 2.0 URL: https://subversion.apache.org/ @@ -135,6 +135,7 @@ Subversion libraries. %{?python_provide:%python_provide python3-subversion} Summary: Python bindings for Subversion Version Control system BuildRequires: python3-devel py3c-devel +Requires: subversion-libs%{?_isa} = %{version}-%{release} %description -n python3-subversion The python3-subversion package includes the Python 3.x bindings to the @@ -386,6 +387,9 @@ sed -i "/^dependency_libs/{ s,%{_libdir}/lib[^a][^p][^r][^ ']*.la, ,g; }" $RPM_BUILD_ROOT%{_libdir}/*.la +# Trim libdir in pkgconfig files to avoid multilib conflicts +sed -i '/^libdir=/d' $RPM_BUILD_ROOT%{_datadir}/pkgconfig/libsvn*.pc + # Install bash completion install -Dpm 644 tools/client-side/bash_completion \ $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/svn @@ -569,6 +573,10 @@ make check-javahl %endif %changelog +* Fri Dec 11 2020 Joe Orton - 1.14.0-10 +- strip libdir from pkgconfig files +- add missing -libs dep from python3-subversion + * Thu Dec 3 2020 Joe Orton - 1.14.0-9 - fix KWallet conditional (#1902598) From b84c8bd57c74f1bab28356d6d35151b04806314c Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 6 Jan 2021 20:29:30 +0900 Subject: [PATCH 06/24] F-34: rebuild against ruby 3.0 --- subversion.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/subversion.spec b/subversion.spec index 94a04db..c65e67b 100644 --- a/subversion.spec +++ b/subversion.spec @@ -56,7 +56,7 @@ Summary: A Modern Concurrent Version Control System Name: subversion Version: 1.14.0 -Release: 10%{?dist} +Release: 11%{?dist} License: ASL 2.0 URL: https://subversion.apache.org/ @@ -573,6 +573,9 @@ make check-javahl %endif %changelog +* Wed Jan 06 2021 Mamoru TASAKA - 1.14.0-11 +- F-34: rebuild against ruby 3.0 + * Fri Dec 11 2020 Joe Orton - 1.14.0-10 - strip libdir from pkgconfig files - add missing -libs dep from python3-subversion From 0fda095229e07e11c9dc82fae582ce1adafdc460 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 12 Jan 2021 00:03:29 +0000 Subject: [PATCH 07/24] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- subversion.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/subversion.spec b/subversion.spec index c65e67b..8db9290 100644 --- a/subversion.spec +++ b/subversion.spec @@ -73,6 +73,7 @@ Patch2: subversion-1.14.0-testwarn.patch Patch3: subversion-1.14.0-soversion.patch Patch4: subversion-1.8.0-rubybind.patch Patch5: subversion-1.8.5-swigplWall.patch +BuildRequires: make BuildRequires: autoconf, libtool, texinfo, which, gcc, gcc-c++ BuildRequires: swig >= 1.3.24, gettext %if %{with bdb} From 9972e74622b7ff9e3c5e55ddc0f21ced3b52bfad Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 21:10:32 +0000 Subject: [PATCH 08/24] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- subversion.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/subversion.spec b/subversion.spec index 8db9290..be10201 100644 --- a/subversion.spec +++ b/subversion.spec @@ -56,7 +56,7 @@ Summary: A Modern Concurrent Version Control System Name: subversion Version: 1.14.0 -Release: 11%{?dist} +Release: 12%{?dist} License: ASL 2.0 URL: https://subversion.apache.org/ @@ -574,6 +574,9 @@ make check-javahl %endif %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 1.14.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jan 06 2021 Mamoru TASAKA - 1.14.0-11 - F-34: rebuild against ruby 3.0 From 467f0d7692895f72ddafff9eba19bbc6cca4dcb4 Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Wed, 10 Feb 2021 14:39:01 +0000 Subject: [PATCH 09/24] update to 1.14.1 (#1927265, #1768698) Resolves: rhbz#1768698 Resolves: rhbz#1927265 --- sources | 2 +- subversion.spec | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/sources b/sources index 1f747a4..77bc6b9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (subversion-1.14.0.tar.bz2) = af6b706fdc91f7ab292fce9d9de582da306fd11e92767dc852687e71a6a8b65bb867fa70d5afd7f76a46005acb1b3c2d3193e690def48cd26875b3a7851cd13b +SHA512 (subversion-1.14.1.tar.bz2) = 0a70c7152b77cdbcb810a029263e4b3240b6ef41d1c19714e793594088d3cca758d40dfbc05622a806b06463becb73207df249393924ce591026b749b875fcdd diff --git a/subversion.spec b/subversion.spec index be10201..b1764c0 100644 --- a/subversion.spec +++ b/subversion.spec @@ -55,12 +55,11 @@ Summary: A Modern Concurrent Version Control System Name: subversion -Version: 1.14.0 -Release: 12%{?dist} +Version: 1.14.1 +Release: 1%{?dist} License: ASL 2.0 URL: https://subversion.apache.org/ - -Source0: https://downloads.apache.org/subversion/subversion-1.14.0.tar.bz2 +Source0: https://downloads.apache.org/subversion/subversion-%{version}.tar.bz2 Source1: subversion.conf Source3: filter-requires.sh Source4: http://www.xsteve.at/prg/emacs/psvn.el @@ -574,6 +573,9 @@ make check-javahl %endif %changelog +* Wed Feb 10 2021 Joe Orton - 1.14.1-1 +- update to 1.14.1 (#1927265, #1768698) + * Wed Jan 27 2021 Fedora Release Engineering - 1.14.0-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 3a98fb6357c63831784cdb6234c2dbbaf995ca0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 2 Mar 2021 16:12:14 +0100 Subject: [PATCH 10/24] Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. --- subversion.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/subversion.spec b/subversion.spec index b1764c0..e82f1bd 100644 --- a/subversion.spec +++ b/subversion.spec @@ -56,7 +56,7 @@ Summary: A Modern Concurrent Version Control System Name: subversion Version: 1.14.1 -Release: 1%{?dist} +Release: 2%{?dist} License: ASL 2.0 URL: https://subversion.apache.org/ Source0: https://downloads.apache.org/subversion/subversion-%{version}.tar.bz2 @@ -573,6 +573,10 @@ make check-javahl %endif %changelog +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 1.14.1-2 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + * Wed Feb 10 2021 Joe Orton - 1.14.1-1 - update to 1.14.1 (#1927265, #1768698) From 5683ab8094666c389a2daabbd1a305ef6a40fd62 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Thu, 20 May 2021 08:08:59 +0200 Subject: [PATCH 11/24] Temporary disable the tests for Perl mass rebuil --- subversion.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/subversion.spec b/subversion.spec index e82f1bd..a9f7766 100644 --- a/subversion.spec +++ b/subversion.spec @@ -1,5 +1,6 @@ # set to zero to avoid running test suite -%bcond_without tests +# Temporary disable the tests for Perl mass rebuild +%bcond_with tests %if 0%{?rhel} || 0%{?eln} %bcond_with kwallet From 7da0927bea9b94003c1643377faf63e7676600c6 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Sat, 22 May 2021 23:31:41 +0200 Subject: [PATCH 12/24] Perl 5.34 rebuild --- subversion.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/subversion.spec b/subversion.spec index a9f7766..01fa8ac 100644 --- a/subversion.spec +++ b/subversion.spec @@ -57,7 +57,7 @@ Summary: A Modern Concurrent Version Control System Name: subversion Version: 1.14.1 -Release: 2%{?dist} +Release: 3%{?dist} License: ASL 2.0 URL: https://subversion.apache.org/ Source0: https://downloads.apache.org/subversion/subversion-%{version}.tar.bz2 @@ -574,6 +574,9 @@ make check-javahl %endif %changelog +* Sat May 22 2021 Jitka Plesnikova - 1.14.1-3 +- Perl 5.34 rebuild + * Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 1.14.1-2 - Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. From 295a35219db23d152c3c388705f3fab70061ce67 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 4 Jun 2021 21:15:48 +0200 Subject: [PATCH 13/24] Rebuilt for Python 3.10 --- subversion.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/subversion.spec b/subversion.spec index 01fa8ac..4e05f31 100644 --- a/subversion.spec +++ b/subversion.spec @@ -57,7 +57,7 @@ Summary: A Modern Concurrent Version Control System Name: subversion Version: 1.14.1 -Release: 3%{?dist} +Release: 4%{?dist} License: ASL 2.0 URL: https://subversion.apache.org/ Source0: https://downloads.apache.org/subversion/subversion-%{version}.tar.bz2 @@ -574,6 +574,9 @@ make check-javahl %endif %changelog +* Fri Jun 04 2021 Python Maint - 1.14.1-4 +- Rebuilt for Python 3.10 + * Sat May 22 2021 Jitka Plesnikova - 1.14.1-3 - Perl 5.34 rebuild From af1f9fda4948bc35632686fd58a7b7df5344fc6b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 18:25:15 +0000 Subject: [PATCH 14/24] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- subversion.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/subversion.spec b/subversion.spec index 4e05f31..4c11a77 100644 --- a/subversion.spec +++ b/subversion.spec @@ -57,7 +57,7 @@ Summary: A Modern Concurrent Version Control System Name: subversion Version: 1.14.1 -Release: 4%{?dist} +Release: 5%{?dist} License: ASL 2.0 URL: https://subversion.apache.org/ Source0: https://downloads.apache.org/subversion/subversion-%{version}.tar.bz2 @@ -574,6 +574,9 @@ make check-javahl %endif %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 1.14.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Fri Jun 04 2021 Python Maint - 1.14.1-4 - Rebuilt for Python 3.10 From fc99096be2ee11f71ac056e80cf0e645ac4e6b00 Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Wed, 1 Dec 2021 11:40:05 +0000 Subject: [PATCH 15/24] fix intermittent FTBFS in tests (#1956806) Resolves: rhbz#1956806 --- subversion-1.14.1-fixjavatests.patch | 30 +++++++++++++++++++++++++ subversion-1.14.1-testnoautoprops.patch | 14 ++++++++++++ subversion.spec | 14 ++++++++---- 3 files changed, 54 insertions(+), 4 deletions(-) create mode 100644 subversion-1.14.1-fixjavatests.patch create mode 100644 subversion-1.14.1-testnoautoprops.patch diff --git a/subversion-1.14.1-fixjavatests.patch b/subversion-1.14.1-fixjavatests.patch new file mode 100644 index 0000000..b7a79b0 --- /dev/null +++ b/subversion-1.14.1-fixjavatests.patch @@ -0,0 +1,30 @@ + +See upstream dev@subversion thread. Fixes intermittent failure of +javahl tests, particularly reproducible on aarch64. + +Message-ID: <11de5f5c-5059-b973-95a1-385e7913a63a@syntevo.com> +From: Alexandr Miloslavskiy + +--- subversion-1.14.1/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java.fixjavatests ++++ subversion-1.14.1/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java +@@ -4676,7 +4676,19 @@ + // RuntimeException("Test exception") is expected here + } + +- tunnelAgent.joinAndTest(); ++ // In this test, there is a race condition that sometimes results in ++ // IOException when 'WAIT_TUNNEL' tries to read from a pipe that ++ // already has its read end closed. This is not an error, but ++ // it's hard to distinguish this case from other IOException which ++ // indicate a problem. To reproduce, simply wrap this test's body in ++ // a loop. The workaround is to ignore any detected IOException. ++ // ++ // tunnelAgent.joinAndTest(); ++ try { ++ tunnelAgent.join(); ++ } catch (InterruptedException e) { ++ e.printStackTrace (); ++ } + } + + /** diff --git a/subversion-1.14.1-testnoautoprops.patch b/subversion-1.14.1-testnoautoprops.patch new file mode 100644 index 0000000..96dd59d --- /dev/null +++ b/subversion-1.14.1-testnoautoprops.patch @@ -0,0 +1,14 @@ + +Fix intermittent failures when "svn add" guesses a near-empty file is binary and hence +the output is different. + +--- subversion-1.14.1/subversion/tests/cmdline/svntest/main.py.testnoautoprops ++++ subversion-1.14.1/subversion/tests/cmdline/svntest/main.py +@@ -691,6 +691,7 @@ + + [miscellany] + interactive-conflicts = false ++enable-auto-props = no + """ + if exclusive_wc_locks: + config_contents += """ diff --git a/subversion.spec b/subversion.spec index 4c11a77..401700b 100644 --- a/subversion.spec +++ b/subversion.spec @@ -1,6 +1,5 @@ -# set to zero to avoid running test suite -# Temporary disable the tests for Perl mass rebuild -%bcond_with tests +# Disable to avoid all the test suites +%bcond_without tests %if 0%{?rhel} || 0%{?eln} %bcond_with kwallet @@ -57,7 +56,7 @@ Summary: A Modern Concurrent Version Control System Name: subversion Version: 1.14.1 -Release: 5%{?dist} +Release: 6%{?dist} License: ASL 2.0 URL: https://subversion.apache.org/ Source0: https://downloads.apache.org/subversion/subversion-%{version}.tar.bz2 @@ -73,6 +72,8 @@ Patch2: subversion-1.14.0-testwarn.patch Patch3: subversion-1.14.0-soversion.patch Patch4: subversion-1.8.0-rubybind.patch Patch5: subversion-1.8.5-swigplWall.patch +Patch6: subversion-1.14.1-testnoautoprops.patch +Patch7: subversion-1.14.1-fixjavatests.patch BuildRequires: make BuildRequires: autoconf, libtool, texinfo, which, gcc, gcc-c++ BuildRequires: swig >= 1.3.24, gettext @@ -234,6 +235,8 @@ This package includes supplementary tools for use with Subversion. %patch3 -p1 -b .soversion %patch4 -p1 -b .rubybind %patch5 -p1 -b .swigplWall +%patch6 -p1 -b .testnoautoprops +%patch7 -p1 -b .fixjavatests : : === Building: @@ -574,6 +577,9 @@ make check-javahl %endif %changelog +* Thu Jul 29 2021 Joe Orton - 1.14.1-6 +- fix intermittent FTBFS in tests (#1956806) + * Fri Jul 23 2021 Fedora Release Engineering - 1.14.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 230cf0ba53f19bbf1050dfecb4ab318ae607b848 Mon Sep 17 00:00:00 2001 From: Richard Lescak Date: Thu, 16 Dec 2021 20:39:17 +0100 Subject: [PATCH 16/24] Replaced deprecated method readfp() in gen_base.py to build with Python 3.11 (#2019019) --- subversion-1.14.1-python-3.11-build.patch | 14 ++++++++++++++ subversion.spec | 8 +++++++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 subversion-1.14.1-python-3.11-build.patch diff --git a/subversion-1.14.1-python-3.11-build.patch b/subversion-1.14.1-python-3.11-build.patch new file mode 100644 index 0000000..8801ffe --- /dev/null +++ b/subversion-1.14.1-python-3.11-build.patch @@ -0,0 +1,14 @@ +Use read_file instead of deprecated readfp - removed in Python 3.11 + +diff -ur subversion-1.14.1/build/generator/gen_base.py subversion-1.14.1-patched/build/generator/gen_base.py +--- subversion-1.14.1/build/generator/gen_base.py 2019-11-04 06:59:36.000000000 +0100 ++++ subversion-1.14.1-patched/build/generator/gen_base.py 2021-12-15 14:04:50.041649320 +0100 +@@ -76,7 +76,7 @@ + + # Now read and parse build.conf + parser = configparser.ConfigParser() +- parser.readfp(open(fname)) ++ parser.read_file(open(fname)) + + self.conf = build_path(os.path.abspath(fname)) + diff --git a/subversion.spec b/subversion.spec index 401700b..97c0f90 100644 --- a/subversion.spec +++ b/subversion.spec @@ -56,7 +56,7 @@ Summary: A Modern Concurrent Version Control System Name: subversion Version: 1.14.1 -Release: 6%{?dist} +Release: 7%{?dist} License: ASL 2.0 URL: https://subversion.apache.org/ Source0: https://downloads.apache.org/subversion/subversion-%{version}.tar.bz2 @@ -74,6 +74,8 @@ Patch4: subversion-1.8.0-rubybind.patch Patch5: subversion-1.8.5-swigplWall.patch Patch6: subversion-1.14.1-testnoautoprops.patch Patch7: subversion-1.14.1-fixjavatests.patch +Patch8: subversion-1.14.1-python-3.11-build.patch + BuildRequires: make BuildRequires: autoconf, libtool, texinfo, which, gcc, gcc-c++ BuildRequires: swig >= 1.3.24, gettext @@ -237,6 +239,7 @@ This package includes supplementary tools for use with Subversion. %patch5 -p1 -b .swigplWall %patch6 -p1 -b .testnoautoprops %patch7 -p1 -b .fixjavatests +%patch8 -p1 -b .pythonbuild : : === Building: @@ -577,6 +580,9 @@ make check-javahl %endif %changelog +* Thu Dec 16 2021 Richard Lescak - 1.14.1-7 +- Replaced deprecated method readfp() in gen_base.py to build with Python 3.11 (#2019019) + * Thu Jul 29 2021 Joe Orton - 1.14.1-6 - fix intermittent FTBFS in tests (#1956806) From 6a438d06956232287b4b4baf5c6d6c291a0c857b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 01:48:20 +0000 Subject: [PATCH 17/24] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- subversion.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/subversion.spec b/subversion.spec index 97c0f90..3eb69e4 100644 --- a/subversion.spec +++ b/subversion.spec @@ -56,7 +56,7 @@ Summary: A Modern Concurrent Version Control System Name: subversion Version: 1.14.1 -Release: 7%{?dist} +Release: 8%{?dist} License: ASL 2.0 URL: https://subversion.apache.org/ Source0: https://downloads.apache.org/subversion/subversion-%{version}.tar.bz2 @@ -580,6 +580,9 @@ make check-javahl %endif %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 1.14.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Dec 16 2021 Richard Lescak - 1.14.1-7 - Replaced deprecated method readfp() in gen_base.py to build with Python 3.11 (#2019019) From 9928155ef9c4c973383a3a0c1d7974b5d61b9647 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timm=20B=C3=A4der?= Date: Mon, 24 Jan 2022 15:07:31 +0100 Subject: [PATCH 18/24] Disable automatic .la file removal https://fedoraproject.org/wiki/Changes/RemoveLaFiles --- subversion.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/subversion.spec b/subversion.spec index 3eb69e4..50e37ac 100644 --- a/subversion.spec +++ b/subversion.spec @@ -1,6 +1,9 @@ # Disable to avoid all the test suites %bcond_without tests +# Disable automatic .la file removal +%global __brp_remove_la_files %nil + %if 0%{?rhel} || 0%{?eln} %bcond_with kwallet %else @@ -56,7 +59,7 @@ Summary: A Modern Concurrent Version Control System Name: subversion Version: 1.14.1 -Release: 8%{?dist} +Release: 9%{?dist} License: ASL 2.0 URL: https://subversion.apache.org/ Source0: https://downloads.apache.org/subversion/subversion-%{version}.tar.bz2 @@ -580,6 +583,10 @@ make check-javahl %endif %changelog +* Mon Jan 24 2022 Timm Bäder - 1.14.1-9 +- Disable automatic .la file removal +- https://fedoraproject.org/wiki/Changes/RemoveLaFiles + * Sat Jan 22 2022 Fedora Release Engineering - 1.14.1-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 8936f2a567597b50552c073a110b15c8323c3d3f Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 27 Jan 2022 10:38:03 +0900 Subject: [PATCH 19/24] F-36: rebuild against ruby31 --- subversion.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/subversion.spec b/subversion.spec index 50e37ac..7b5b09b 100644 --- a/subversion.spec +++ b/subversion.spec @@ -59,7 +59,7 @@ Summary: A Modern Concurrent Version Control System Name: subversion Version: 1.14.1 -Release: 9%{?dist} +Release: 10%{?dist} License: ASL 2.0 URL: https://subversion.apache.org/ Source0: https://downloads.apache.org/subversion/subversion-%{version}.tar.bz2 @@ -583,6 +583,9 @@ make check-javahl %endif %changelog +* Thu Jan 27 2022 Mamoru TASAKA - 1.14.1-10 +- F-36: rebuild against ruby31 + * Mon Jan 24 2022 Timm Bäder - 1.14.1-9 - Disable automatic .la file removal - https://fedoraproject.org/wiki/Changes/RemoveLaFiles From 55cb5655267236b99592cb12be454bc87dda4705 Mon Sep 17 00:00:00 2001 From: Jiri Date: Sun, 6 Feb 2022 00:21:36 +0100 Subject: [PATCH 20/24] Rebuilt for java-17-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java17 --- subversion.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/subversion.spec b/subversion.spec index 7b5b09b..c68ab84 100644 --- a/subversion.spec +++ b/subversion.spec @@ -59,7 +59,7 @@ Summary: A Modern Concurrent Version Control System Name: subversion Version: 1.14.1 -Release: 10%{?dist} +Release: 11%{?dist} License: ASL 2.0 URL: https://subversion.apache.org/ Source0: https://downloads.apache.org/subversion/subversion-%{version}.tar.bz2 @@ -583,6 +583,9 @@ make check-javahl %endif %changelog +* Sat Feb 05 2022 Jiri Vanek - 1.14.1-11 +- Rebuilt for java-17-openjdk as system jdk + * Thu Jan 27 2022 Mamoru TASAKA - 1.14.1-10 - F-36: rebuild against ruby31 From 786c0a870cdfc0df959191b8fd9a40869f3cadde Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Wed, 4 May 2022 10:30:57 +0100 Subject: [PATCH 21/24] update to 1.14.2 (#2073852, CVE-2021-28544, CVE-2022-24070) --- sources | 2 +- subversion.spec | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/sources b/sources index 77bc6b9..5a685ca 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (subversion-1.14.1.tar.bz2) = 0a70c7152b77cdbcb810a029263e4b3240b6ef41d1c19714e793594088d3cca758d40dfbc05622a806b06463becb73207df249393924ce591026b749b875fcdd +SHA512 (subversion-1.14.2.tar.bz2) = 20ada4688ca07d9fb8da4b7d53b5084568652a3b9418c65e688886bae950a16a3ff37710fcfc9c29ef14a89e75b2ceec4e9cf35d5876a7896ebc2b512cfb9ecc diff --git a/subversion.spec b/subversion.spec index c68ab84..37b0616 100644 --- a/subversion.spec +++ b/subversion.spec @@ -58,8 +58,8 @@ Summary: A Modern Concurrent Version Control System Name: subversion -Version: 1.14.1 -Release: 11%{?dist} +Version: 1.14.2 +Release: 1%{?dist} License: ASL 2.0 URL: https://subversion.apache.org/ Source0: https://downloads.apache.org/subversion/subversion-%{version}.tar.bz2 @@ -76,7 +76,6 @@ Patch3: subversion-1.14.0-soversion.patch Patch4: subversion-1.8.0-rubybind.patch Patch5: subversion-1.8.5-swigplWall.patch Patch6: subversion-1.14.1-testnoautoprops.patch -Patch7: subversion-1.14.1-fixjavatests.patch Patch8: subversion-1.14.1-python-3.11-build.patch BuildRequires: make @@ -241,7 +240,6 @@ This package includes supplementary tools for use with Subversion. %patch4 -p1 -b .rubybind %patch5 -p1 -b .swigplWall %patch6 -p1 -b .testnoautoprops -%patch7 -p1 -b .fixjavatests %patch8 -p1 -b .pythonbuild : @@ -583,6 +581,9 @@ make check-javahl %endif %changelog +* Wed May 4 2022 Joe Orton - 1.14.2-1 +- update to 1.14.2 (#2073852, CVE-2021-28544, CVE-2022-24070) + * Sat Feb 05 2022 Jiri Vanek - 1.14.1-11 - Rebuilt for java-17-openjdk as system jdk From dfc31038aee879266966ba4d3efcde25fb3effb3 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Tue, 31 May 2022 22:09:00 +0200 Subject: [PATCH 22/24] Perl 5.36 rebuild --- subversion.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/subversion.spec b/subversion.spec index 37b0616..7fd6631 100644 --- a/subversion.spec +++ b/subversion.spec @@ -59,7 +59,7 @@ Summary: A Modern Concurrent Version Control System Name: subversion Version: 1.14.2 -Release: 1%{?dist} +Release: 2%{?dist} License: ASL 2.0 URL: https://subversion.apache.org/ Source0: https://downloads.apache.org/subversion/subversion-%{version}.tar.bz2 @@ -581,6 +581,9 @@ make check-javahl %endif %changelog +* Tue May 31 2022 Jitka Plesnikova - 1.14.2-2 +- Perl 5.36 rebuild + * Wed May 4 2022 Joe Orton - 1.14.2-1 - update to 1.14.2 (#2073852, CVE-2021-28544, CVE-2022-24070) From 66f78b6f0b9f8ff4de970918b64a2690e31af527 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 13 Jun 2022 15:27:35 +0200 Subject: [PATCH 23/24] Rebuilt for Python 3.11 --- subversion.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/subversion.spec b/subversion.spec index 7fd6631..f3f9556 100644 --- a/subversion.spec +++ b/subversion.spec @@ -59,7 +59,7 @@ Summary: A Modern Concurrent Version Control System Name: subversion Version: 1.14.2 -Release: 2%{?dist} +Release: 3%{?dist} License: ASL 2.0 URL: https://subversion.apache.org/ Source0: https://downloads.apache.org/subversion/subversion-%{version}.tar.bz2 @@ -581,6 +581,9 @@ make check-javahl %endif %changelog +* Mon Jun 13 2022 Python Maint - 1.14.2-3 +- Rebuilt for Python 3.11 + * Tue May 31 2022 Jitka Plesnikova - 1.14.2-2 - Perl 5.36 rebuild From 28a837129261f24545a78c9a01056b30fb36ae98 Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Tue, 5 Jul 2022 14:30:11 +0100 Subject: [PATCH 24/24] update for new Java arches and bump to JDK 17 (#2103909) Resolves: rhbz#2103909 --- subversion.spec | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/subversion.spec b/subversion.spec index f3f9556..9e98ddd 100644 --- a/subversion.spec +++ b/subversion.spec @@ -29,10 +29,10 @@ %bcond_without ruby %endif -%ifarch %{power64} s390x -%global with_java 0 +%ifarch %{java_arches} +%bcond_without java %else -%global with_java 1 +%bcond_with java %endif %if %{with python2} == %{with python3} @@ -59,7 +59,7 @@ Summary: A Modern Concurrent Version Control System Name: subversion Version: 1.14.2 -Release: 3%{?dist} +Release: 4%{?dist} License: ASL 2.0 URL: https://subversion.apache.org/ Source0: https://downloads.apache.org/subversion/subversion-%{version}.tar.bz2 @@ -198,11 +198,11 @@ Requires: subversion-libs%{?_isa} = %{version}-%{release} %description perl This package includes the Perl bindings to the Subversion libraries. -%if %{with_java} +%if %{with java} %package javahl Summary: JNI bindings to the Subversion libraries Requires: subversion = %{version}-%{release} -BuildRequires: java-11-openjdk-devel +BuildRequires: java-17-openjdk-devel # JAR repacking requires both zip and unzip in the buildroot BuildRequires: zip, unzip # For the tests @@ -245,7 +245,7 @@ This package includes supplementary tools for use with Subversion. : : === Building: : === Python3=%{with python3} Python2=%{with python2} PySwig=%{with pyswig} -: === Java=%{with_java} Ruby=%{with ruby} +: === Java=%{with java} Ruby=%{with ruby} : === BDB=%{with bdb} Tests=%{with tests} KWallet=%{with kwallet} : @@ -294,7 +294,7 @@ export CC=gcc CXX=g++ JAVA_HOME=%{jdk_path} --disable-static --with-sasl=%{_prefix} \ --with-libmagic=%{_prefix} \ --with-gnome-keyring \ -%if %{with_java} +%if %{with java} --enable-javahl \ --with-junit=%{_prefix}/share/java/junit.jar \ %endif @@ -315,7 +315,7 @@ make swig-pl swig-pl-lib %if %{with ruby} make swig-rb swig-rb-lib %endif -%if %{with_java} +%if %{with java} # javahl-javah does not parallel-make with javahl #make javahl-java javahl-javah make javahl @@ -329,7 +329,7 @@ make install-swig-py %{swigdirs} DESTDIR=$RPM_BUILD_ROOT make install-swig-pl-lib install-swig-rb DESTDIR=$RPM_BUILD_ROOT make pure_vendor_install -C subversion/bindings/swig/perl/native \ PERL_INSTALL_ROOT=$RPM_BUILD_ROOT -%if %{with_java} +%if %{with java} make install-javahl-java install-javahl-lib javahl_javadir=%{_javadir} DESTDIR=$RPM_BUILD_ROOT %endif @@ -467,7 +467,7 @@ if ! make check-swig-py; then fi %endif # check-swig-rb omitted: it runs svnserve -%if %{with_java} +%if %{with java} make check-javahl %endif %endif @@ -487,7 +487,7 @@ make check-javahl %ldconfig_scriptlets ruby -%if %{with_java} +%if %{with java} %ldconfig_scriptlets javahl %endif @@ -520,7 +520,7 @@ make check-javahl %{_libdir}/libsvn*.so.* %exclude %{_libdir}/libsvn_swig_perl* %exclude %{_libdir}/libsvn_swig_ruby* -%if %{with_java} +%if %{with java} %{_libdir}/libsvnjavahl-*.so %endif %if %{with kwallet} @@ -575,12 +575,15 @@ make check-javahl %{ruby_vendorarchdir}/svn %endif -%if %{with_java} +%if %{with java} %files javahl %{_javadir}/svn-javahl.jar %endif %changelog +* Tue Jul 5 2022 Joe Orton - 1.14.2-4 +- update for new Java arches and bump to JDK 17 (#2103909) + * Mon Jun 13 2022 Python Maint - 1.14.2-3 - Rebuilt for Python 3.11