Accepting request 1139380 from server:mail

OBS-URL: https://build.opensuse.org/request/show/1139380
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fetchmail?expand=0&rev=113

fetchmail.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jan 17 00:33:48 UTC 2024 - Steve Kowalik <steven.kowalik@suse.com>
+
+- Add patch fetchmailconf-no-more-future.patch:
+  * Drop requirement for python-future from fetchmailconf.
+
 -------------------------------------------------------------------
 Wed Mar  1 17:15:06 UTC 2023 - David Anes <david.anes@suse.com>
 

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

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, <esr@snark.thyrsus.com>,
+ # Matthias Andree <matthias.andree@gmx.de>
+-# 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)