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)