From 3ed50a856e0e4ff21888100ed60f50e1901da3d7 Mon Sep 17 00:00:00 2001
From: David Kaufmann <astra@ionic.at>
Date: Thu, 11 Nov 2021 01:52:04 +0100
Subject: [PATCH 1/2] update to 0.18

---
 vdirsyncer-0.16.8-click_compatibility.patch   | 35 -------------------
 ....16.8-python_getiterator_deprecation.patch | 22 ------------
 vdirsyncer.spec                               | 11 +++---
 3 files changed, 5 insertions(+), 63 deletions(-)
 delete mode 100644 vdirsyncer-0.16.8-click_compatibility.patch
 delete mode 100644 vdirsyncer-0.16.8-python_getiterator_deprecation.patch

diff --git a/vdirsyncer-0.16.8-click_compatibility.patch b/vdirsyncer-0.16.8-click_compatibility.patch
deleted file mode 100644
index c0ee62f..0000000
--- a/vdirsyncer-0.16.8-click_compatibility.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-commit 3eb9ce5ae4320d52e6c876874511ff96a8a45f51
-Author: Hugo Osvaldo Barrera <hugo@barrera.io>
-Date:   Tue Jun 9 14:45:02 2020 +0200
-
-    Add compatibility with latest click
-
-diff --git a/setup.py b/setup.py
-index 59549f16842a..d584b95dd297 100644
---- a/setup.py
-+++ b/setup.py
-@@ -11,7 +11,7 @@ from setuptools import setup
- 
- requirements = [
-     # https://github.com/mitsuhiko/click/issues/200
--    'click>=5.0,<6.0',
-+    'click>=5.0',
-     'click-log>=0.3.0, <0.4.0',
- 
-     # https://github.com/pimutils/vdirsyncer/issues/478
-diff --git a/tests/system/cli/test_sync.py b/tests/system/cli/test_sync.py
-index f242376417f3..43d35dd8541e 100644
---- a/tests/system/cli/test_sync.py
-+++ b/tests/system/cli/test_sync.py
-@@ -123,7 +123,10 @@ def test_verbosity(tmpdir, runner):
-     runner.write_with_general('')
-     result = runner.invoke(['--verbosity=HAHA', 'sync'])
-     assert result.exception
--    assert 'invalid value for "--verbosity"' in result.output.lower()
-+    assert (
-+        'invalid value for "--verbosity"' in result.output.lower()
-+        or "invalid value for '--verbosity'" in result.output.lower()
-+    )
- 
- 
- def test_collections_cache_invalidation(tmpdir, runner):
diff --git a/vdirsyncer-0.16.8-python_getiterator_deprecation.patch b/vdirsyncer-0.16.8-python_getiterator_deprecation.patch
deleted file mode 100644
index bdcb7f2..0000000
--- a/vdirsyncer-0.16.8-python_getiterator_deprecation.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 7577fa21177442aacc2d86640ef28cebf1c4aaef Mon Sep 17 00:00:00 2001
-From: Hugo Osvaldo Barrera <hugo@barrera.io>
-Date: Tue, 9 Jun 2020 17:04:46 +0200
-Subject: [PATCH] Update usage of deprecated method
-
----
- vdirsyncer/storage/dav.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/vdirsyncer/storage/dav.py b/vdirsyncer/storage/dav.py
-index 07d164fb..a7e2422c 100644
---- a/vdirsyncer/storage/dav.py
-+++ b/vdirsyncer/storage/dav.py
-@@ -124,7 +124,7 @@ def _merge_xml(items):
-         return None
-     rv = items[0]
-     for item in items[1:]:
--        rv.extend(item.getiterator())
-+        rv.extend(item.iter())
-     return rv
- 
- 
diff --git a/vdirsyncer.spec b/vdirsyncer.spec
index 10846fe..40d929f 100644
--- a/vdirsyncer.spec
+++ b/vdirsyncer.spec
@@ -9,15 +9,13 @@
 %global _docdir_fmt %{name}
 
 Name:       vdirsyncer
-Version:    0.16.8
-Release:    7%{?dist}
+Version:    0.18.0
+Release:    1%{?dist}
 Summary:    %{sum}
 
 License:    BSD
 URL:        https://github.com/pimutils/%{name}
 Source0:    %{pypi_source}
-Patch0:     vdirsyncer-0.16.8-click_compatibility.patch
-Patch1:     vdirsyncer-0.16.8-python_getiterator_deprecation.patch
 
 BuildArch:  noarch
 Obsoletes:  python2-%{srcname} <= 0.12.1
@@ -88,8 +86,6 @@ for the vdirsyncer calendar/address-book synchronization utility.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
 # Here we set upstream version based on setuptools_scm documentation
@@ -149,6 +145,9 @@ sh build.sh tests
 %doc docs/_build/html docs/_build/text
 
 %changelog
+* Thu Nov 11 2021 David Kaufmann <astra@ionic.at> - 0.18.0-1
+- Update to v0.18.0
+
 * Tue Jul 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.16.8-7
 - Second attempt - Rebuilt for
   https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

From 901ce6e0eb21b2bce59f401908f33b66b0b87aa1 Mon Sep 17 00:00:00 2001
From: David Kaufmann <astra@ionic.at>
Date: Thu, 11 Nov 2021 01:55:59 +0100
Subject: [PATCH 2/2] and add sources

---
 .gitignore | 1 +
 sources    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 604f295..74fbcff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@
 /vdirsyncer-0.16.3.tar.gz
 /vdirsyncer-0.16.7.tar.gz
 /vdirsyncer-0.16.8.tar.gz
+/vdirsyncer-0.18.0.tar.gz
diff --git a/sources b/sources
index f2793c9..271e235 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vdirsyncer-0.16.8.tar.gz) = 12cb50f592085af37bd9c4207c0d31fdd38fc2a44712eb6288b12e7e7ee9af82070d1d405fa9579e935e545e6c92aafb6f8334ebde4976c4eb9412e78e7c5ada
+SHA512 (vdirsyncer-0.18.0.tar.gz) = 0daefdc57f5562a7cdddba014fdeae9f1e68ec08568753073040dfc52e1740662b367df35a8f45e31d0672df5717b257fc0293eb4bd4c9bb10bad7cc79b12556