From d3d6f67ccb93da9fa9e28e61aaf315e9dbfbcc2f5fc17a29f1ff5b0c979df77e Mon Sep 17 00:00:00 2001 From: David Anes Date: Wed, 17 Jan 2024 07:42:14 +0000 Subject: [PATCH] Accepting request 1139330 from home:StevenK:branches:server:mail - Add patch fetchmailconf-no-more-future.patch: * Drop requirement for python-future from fetchmailconf. OBS-URL: https://build.opensuse.org/request/show/1139330 OBS-URL: https://build.opensuse.org/package/show/server:mail/fetchmail?expand=0&rev=155 --- fetchmail.changes | 6 ++++ fetchmail.spec | 4 +-- fetchmailconf-no-more-future.patch | 45 ++++++++++++++++++++++++++++++ 3 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 fetchmailconf-no-more-future.patch diff --git a/fetchmail.changes b/fetchmail.changes index 8308e97..2eeaa45 100644 --- a/fetchmail.changes +++ b/fetchmail.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jan 17 00:33:48 UTC 2024 - Steve Kowalik + +- Add patch fetchmailconf-no-more-future.patch: + * Drop requirement for python-future from fetchmailconf. + ------------------------------------------------------------------- Wed Mar 1 17:15:06 UTC 2023 - David Anes diff --git a/fetchmail.spec b/fetchmail.spec index 6c57ff1..0fd48fb 100644 --- a/fetchmail.spec +++ b/fetchmail.spec @@ -1,7 +1,7 @@ # # spec file for package fetchmail # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -49,6 +49,7 @@ Patch10: fetchmail-oauth2-c-calculate-and-pass-in-correct-buffer-size-to- Patch11: fetchmail-increase-max-password-length-to-handle-oauth-tokens.patch Patch12: fetchmail-bump-max-passwordlen-to-1bytes.patch Patch13: fetchmail-add-readme-oauth2-issue-27.patch +Patch14: fetchmailconf-no-more-future.patch BuildRequires: automake BuildRequires: bison BuildRequires: fdupes @@ -84,7 +85,6 @@ is included in the fetchmailconf package. Summary: Fetchmail Configuration Utility Requires: %{name} = %{version} Requires: python3 >= 3.7 -Requires: python3-future Requires: python3-tk %description -n fetchmailconf diff --git a/fetchmailconf-no-more-future.patch b/fetchmailconf-no-more-future.patch new file mode 100644 index 0000000..e242040 --- /dev/null +++ b/fetchmailconf-no-more-future.patch @@ -0,0 +1,45 @@ +Index: fetchmail-6.4.37/fetchmailconf.py +=================================================================== +--- fetchmail-6.4.37.orig/fetchmailconf.py ++++ fetchmail-6.4.37/fetchmailconf.py +@@ -3,21 +3,12 @@ + # A GUI configurator for generating fetchmail configuration files. + # by Eric S. Raymond, , + # Matthias Andree +-# Requires Python with Tkinter, and the following OS-dependent services: ++# Requires Python 3.4+ with Tkinter, and the following OS-dependent services: + # posix, posixpath, socket + + # WARNING: this needs to be updated for fetchmail 6.4's SSL options, + # and other recent new options; + +-from __future__ import print_function +-from __future__ import division +-from past.builtins import execfile +-from future import standard_library +-standard_library.install_aliases() +-from builtins import str +-from builtins import range +-from past.utils import old_div +-from builtins import object + import sys + import time + import os +@@ -37,7 +28,7 @@ except: + + VERSION = "1.63.5" + +-MIN_PY = (2, 7, 13) ++MIN_PY = (3, 4, 0) + if sys.version_info < MIN_PY: + sys.exit("fetchmailconf: Python %s.%s.%s or later is required.\n" % MIN_PY) + +@@ -535,7 +526,7 @@ class LabeledEntry(Frame): + def ButtonBar(frame, legend, ref, alternatives, depth, command): + # array of radio buttons, caption to left, picking from a string list + bbar = Frame(frame) +- width = old_div((len(alternatives)+1), depth) ++ width = len(alternatives)+1 // depth + Label(bbar, text=legend).pack(side=LEFT) + for column in range(width): + subframe = Frame(bbar)