diff --git a/Make-docs-build-python3-compatible.patch b/Make-docs-build-python3-compatible.patch new file mode 100644 index 0000000..58a3e86 --- /dev/null +++ b/Make-docs-build-python3-compatible.patch @@ -0,0 +1,36 @@ +From 16c745b7e9e239535a8c71dc7022b477a5165e01 Mon Sep 17 00:00:00 2001 +From: Robbie Harwood +Date: Wed, 13 Jun 2018 15:07:48 -0400 +Subject: [PATCH] Make docs build python3-compatible + +python3 removed execfile(), which we use for loading version data and +paths information in docs. Call exec() directly instead. + +ticket: 8692 (new) +(cherry picked from commit a7c6d98480f1e33454173f88381921472d72f80a) +--- + doc/conf.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/doc/conf.py b/doc/conf.py +index 25ba214a8..0555808e6 100644 +--- a/doc/conf.py ++++ b/doc/conf.py +@@ -50,7 +50,7 @@ copyright = u'1985-2018, MIT' + # The version info for the project you're documenting, acts as replacement for + # |version| and |release|, also used in various other places throughout the + # built documents. +-execfile("version.py") ++exec(open("version.py").read()) + # The short X.Y version. + r_list = [r_major, r_minor] + if r_patch: +@@ -238,7 +238,7 @@ if 'mansubs' in tags: + ckeytab = '``@CKTNAME@``' + elif 'pathsubs' in tags: + # Read configured paths from a file produced by the build system. +- execfile('paths.py') ++ exec(open("paths.py").read()) + else: + bindir = ':ref:`BINDIR `' + sbindir = ':ref:`SBINDIR `' diff --git a/krb5.spec b/krb5.spec index a408bf7..305ffcc 100644 --- a/krb5.spec +++ b/krb5.spec @@ -18,7 +18,7 @@ Summary: The Kerberos network authentication system Name: krb5 Version: 1.16.1 # for prerelease, should be e.g., 0.% {prerelease}.1% { ?dist } (without spaces) -Release: 4%{?dist} +Release: 5%{?dist} # lookaside-cached sources; two downloads and a build artifact Source0: https://web.mit.edu/kerberos/dist/krb5/1.16/krb5-%{version}%{prerelease}.tar.gz @@ -90,6 +90,7 @@ Patch70: Fix-segfault-in-finish_dispatch.patch Patch71: Log-when-non-root-ksu-authorization-fails.patch Patch72: Add-k5_dir_filenames-to-libkrb5support.patch Patch73: Process-profile-includedir-in-sorted-order.patch +Patch74: Make-docs-build-python3-compatible.patch License: MIT URL: http://web.mit.edu/kerberos/www/ @@ -741,6 +742,10 @@ exit 0 %{_libdir}/libkadm5srv_mit.so.* %changelog +* Thu Jun 14 2018 Robbie Harwood - 1.16.1-5 +- Make docs build python3-compatible +- Resolves: #1590928 + * Thu Jun 07 2018 Robbie Harwood - 1.16.1-4 - Update includedir processing to match upstream