From e0fa0bea26928498bffaca00e0cb99600a1c7ff2 Mon Sep 17 00:00:00 2001 From: Brian (bex) Exelbierd Date: May 19 2019 14:09:36 +0000 Subject: adding patch for python backports drop --- diff --git a/backports-csv.patch b/backports-csv.patch new file mode 100644 index 0000000..05618f1 --- /dev/null +++ b/backports-csv.patch @@ -0,0 +1,32 @@ +diff --git a/mailmerge/api.py b/mailmerge/api.py +index ebf01ec..2c5f5cd 100644 +--- a/mailmerge/api.py ++++ b/mailmerge/api.py +@@ -13,8 +13,13 @@ import smtplib + import configparser + import getpass + import datetime ++ + # NOTE: Python 2.x UTF8 support requires csv and email backports +-from backports import csv ++try: ++ from backports import csv ++except ImportError: ++ import csv ++ + import future.backports.email as email # pylint: disable=useless-import-alias + import future.backports.email.mime # pylint: disable=unused-import + import future.backports.email.mime.application # pylint: disable=unused-import +diff --git a/setup.py b/setup.py +index 7e0988e..f43aa55 100644 +--- a/setup.py ++++ b/setup.py +@@ -26,7 +26,7 @@ setup( + "configparser", + "jinja2", + "future", +- "backports.csv", ++ "backports.csv;python_version<='2.7'", + "markdown", + ], + extras_require={ diff --git a/python-mailmerge.spec b/python-mailmerge.spec index f890aa5..2b98850 100644 --- a/python-mailmerge.spec +++ b/python-mailmerge.spec @@ -3,12 +3,14 @@ Name: python-%{srcname} Version: 1.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Simple command line mail merge tool License: MIT URL: https://github.com/awdeorio/mailmerge Source0: %{pypi_source} +# https://github.com/awdeorio/mailmerge/pull/44 +Patch0: backports-csv.patch BuildArch: noarch @@ -26,7 +28,7 @@ BuildRequires: python3-setuptools %{summary}. %prep -%autosetup -n %{srcname}-%{version} +%autosetup -n %{srcname}-%{version} -p1 rm -vr *.egg-info %build @@ -43,5 +45,7 @@ rm -vr *.egg-info %{python3_sitelib}/mailmerge-*.egg-info/ %changelog +* Sun May 19 2019 Brian Exelbierd - 1.9-2 +- Adding Patch for F30 backports-csv drop * Thu May 16 2019 Brian Exelbierd - 1.9-1 - Initial package