From 465bb5fb657de714aa8fd69b02dffa6d893e284c Mon Sep 17 00:00:00 2001
From: Brian (bex) Exelbierd <bex@pobox.com>
Date: Apr 23 2020 17:27:45 +0000
Subject: Update to 2.1.0


Remove merged patch

---

diff --git a/.gitignore b/.gitignore
index 1159184..2b8331e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /mailmerge-1.9.tar.gz
+/mailmerge-2.1.0.tar.gz
diff --git a/backports-csv.patch b/backports-csv.patch
deleted file mode 100644
index 05618f1..0000000
--- a/backports-csv.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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 0610086..805d684 100644
--- a/python-mailmerge.spec
+++ b/python-mailmerge.spec
@@ -2,15 +2,13 @@
 %{?python_enable_dependency_generator}
 
 Name:          python-%{srcname}
-Version:       1.9
-Release:       6%{?dist}
+Version:       2.1.0
+Release:       1%{?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
 
@@ -22,7 +20,6 @@ Summary:       %{summary}
 %{?python_provide:%python_provide python3-%{srcname}}
 Provides:      %{srcname} = %{version}-%{release}
 BuildRequires: python3-devel
-BuildRequires: python3-setuptools
 
 %description -n python3-%{srcname}
 %{summary}.
@@ -45,6 +42,10 @@ rm -vr *.egg-info
 %{python3_sitelib}/mailmerge-*.egg-info/
 
 %changelog
+* Thu Apr 23 2020 Brian Exelbierd <bexelbie@redhat.com> - 2.1-1
+- Update to 2.1.0
+- remove merged patch
+
 * Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.9-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
@@ -59,5 +60,6 @@ rm -vr *.egg-info
 
 * Sun May 19 2019 Brian Exelbierd <bexelbie@redhat.com> - 1.9-2
 - Adding Patch for F30 backports-csv drop
+
 * Thu May 16 2019 Brian Exelbierd <bexelbie@redhat.com> - 1.9-1
 - Initial package
diff --git a/sources b/sources
index e6ef1ee..a988242 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mailmerge-1.9.tar.gz) = b4bd1d35acf54fa7a46281e230167ce85b04a78239e611e54606c8db26fdbf1e9e8999d1fe61252a0436f04e2c67516d7d8b0c15bde8925db75213c72f74725a
+SHA512 (mailmerge-2.1.0.tar.gz) = 97536a9888ea073cf335db0702de4beeaa3ca5a02f5a7d536a4dc2704ff3aa92d156ae5c5c3495ae2cc38d23279b8e48f76727c632f410b1955d707cff8e913d