diff --git a/libpst.spec b/libpst.spec index ee6d6a4..5b64f5f 100644 --- a/libpst.spec +++ b/libpst.spec @@ -15,10 +15,12 @@ Summary: Utilities to convert Outlook .pst files to other formats Name: libpst Version: 0.6.76 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ URL: http://www.five-ten-sg.com/%{name}/ Source: %{url}/packages/%{name}-%{version}.tar.gz +# https://github.com/autoconf-archive/autoconf-archive/pull/235 +Patch0: m4-python310.patch BuildRequires: make BuildRequires: libtool gcc-c++ @@ -132,6 +134,7 @@ libpst utilities. %prep %setup -q +%patch0 -p1 %build @@ -215,6 +218,9 @@ rm %{buildroot}%{_mandir}/man1/pst2dii.1* %changelog +* Thu Aug 05 2021 Yaakov Selkowitz - 0.6.76-4 +- Add m4 patches for Python 3.10 + * Thu Jul 22 2021 Fedora Release Engineering - 0.6.76-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/m4-python310.patch b/m4-python310.patch new file mode 100644 index 0000000..ed8aab4 --- /dev/null +++ b/m4-python310.patch @@ -0,0 +1,28 @@ +https://github.com/autoconf-archive/autoconf-archive/pull/235 + +diff --git a/m4/ax_python_devel.m4 b/m4/ax_python_devel.m4 +index 9d4eecf7..d30ee943 100644 +--- a/m4/ax_python_devel.m4 ++++ b/m4/ax_python_devel.m4 +@@ -190,7 +190,7 @@ EOD` + ac_python_version=$PYTHON_VERSION + else + ac_python_version=`$PYTHON -c "import sys; \ +- print (sys.version[[:3]])"` ++ print ("%d.%d" % sys.version_info[[:2]])"` + fi + fi + +diff --git a/m4/ax_python.m4 b/m4/ax_python.m4 +index 7c9f511f..c2577905 100644 +--- a/m4/ax_python.m4 ++++ b/m4/ax_python.m4 +@@ -55,7 +55,7 @@ + AC_DEFUN([AX_PYTHON], + [AC_MSG_CHECKING(for python build information) + AC_MSG_RESULT([]) +-for python in python3.9 python3.8 python3.7 python3.6 python3.5 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python; do ++for python in python3.11 python3.10 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python; do + AC_CHECK_PROGS(PYTHON_BIN, [$python]) + ax_python_bin=$PYTHON_BIN + if test x$ax_python_bin != x; then