fix duplicate changelog line

.gitignore

@@ -16,3 +16,4 @@
 /vdirsyncer-0.16.2.tar.gz
 /vdirsyncer-0.16.3.tar.gz
 /vdirsyncer-0.16.7.tar.gz
+/vdirsyncer-0.16.8.tar.gz

sources

@@ -1 +1 @@
-SHA512 (vdirsyncer-0.16.7.tar.gz) = 218c6781139a9e979077308dc732756cc27ecb67966e4b52be31cb1ebf04d224443036102d5c4bad253b9dcf533939f0b72082166f0fe94e042a7e946b8fad0e
+SHA512 (vdirsyncer-0.16.8.tar.gz) = 12cb50f592085af37bd9c4207c0d31fdd38fc2a44712eb6288b12e7e7ee9af82070d1d405fa9579e935e545e6c92aafb6f8334ebde4976c4eb9412e78e7c5ada

vdirsyncer-0.16.8-click_compatibility.patch

@@ -0,0 +1,35 @@
+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):

vdirsyncer-0.16.8-python_getiterator_deprecation.patch

@@ -0,0 +1,22 @@
+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
+ 
+ 

vdirsyncer.spec

@@ -9,13 +9,15 @@
 %global _docdir_fmt %{name}
 
 Name:       vdirsyncer
-Version:    0.16.7
-Release:    9%{?git_tag}%{?dist}
+Version:    0.16.8
+Release:    4%{?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
@@ -41,7 +43,7 @@ Requires:       python3-click-log >= 0.3
 Requires:       python3-click-threading >= 0.4.0
 Requires:       python3-icalendar
 Requires:       python3-lxml >= 3.1
-Requires:       python3-requests >= 2.4.1
+Requires:       python3-requests >= 2.10
 Requires:       python3-requests-oauthlib
 Requires:       python3-requests-toolbelt >= 0.4.0
 Requires:       python3-vdirsyncer = %{version}
@@ -64,7 +66,7 @@ Requires:       python3-click-log >= 0.3
 Requires:       python3-click-threading >= 0.4.0
 Requires:       python3-icalendar
 Requires:       python3-lxml >= 3.1
-Requires:       python3-requests >= 2.4.1
+Requires:       python3-requests >= 2.10
 Requires:       python3-requests-oauthlib
 Requires:       python3-requests-toolbelt >= 0.4.0
 
@@ -85,6 +87,8 @@ 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
@@ -144,6 +148,15 @@ sh build.sh tests
 %doc docs/_build/html docs/_build/text
 
 %changelog
+* Sun Nov 01 2020 David Kaufmann <astra@ionic.at> - 0.16.8-4
+- Fix patch, as only Patch0 gets applied by default
+
+* Sat Oct 31 2020 David Kaufmann <astra@ionic.at> - 0.16.8-3
+- Fix for python 3.9 deprecation of getiterator
+
+* Thu Aug 13 2020 David Kaufmann <astra@ionic.at> - 0.16.8-1
+- Update to v0.16.8
+
 * Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.16.7-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild