From 79d6574c8ee84141a866a56d23987258b0d2f6e5a17a9ee6416289ce4d2264ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 1 Sep 2020 20:17:04 +0000 Subject: [PATCH 1/4] Accepting request 831282 from home:-miska- -fix compatibility with latest click - patch taken directly from upstream git * 3eb9ce5ae4320d52e6c876874511ff96a8a45f51.patch OBS-URL: https://build.opensuse.org/request/show/831282 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-vdirsyncer?expand=0&rev=28 --- ...ce5ae4320d52e6c876874511ff96a8a45f51.patch | 39 +++++++++++++++++++ python-vdirsyncer.changes | 6 +++ python-vdirsyncer.spec | 3 ++ 3 files changed, 48 insertions(+) create mode 100644 3eb9ce5ae4320d52e6c876874511ff96a8a45f51.patch diff --git a/3eb9ce5ae4320d52e6c876874511ff96a8a45f51.patch b/3eb9ce5ae4320d52e6c876874511ff96a8a45f51.patch new file mode 100644 index 0000000..a97e82a --- /dev/null +++ b/3eb9ce5ae4320d52e6c876874511ff96a8a45f51.patch @@ -0,0 +1,39 @@ +From 3eb9ce5ae4320d52e6c876874511ff96a8a45f51 Mon Sep 17 00:00:00 2001 +From: Hugo Osvaldo Barrera +Date: Tue, 9 Jun 2020 14:45:02 +0200 +Subject: [PATCH] Add compatibility with latest click + +--- + setup.py | 2 +- + tests/system/cli/test_sync.py | 5 ++++- + 2 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/setup.py b/setup.py +index 59549f16..d584b95d 100644 +--- a/setup.py ++++ b/setup.py +@@ -11,7 +11,7 @@ + + 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 f2423764..43d35dd8 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/python-vdirsyncer.changes b/python-vdirsyncer.changes index 40cb722..cda8f12 100644 --- a/python-vdirsyncer.changes +++ b/python-vdirsyncer.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Sep 1 15:11:22 UTC 2020 - Michal Hrusecky + +-fix compatibility with latest click - patch taken directly from upstream git + * 3eb9ce5ae4320d52e6c876874511ff96a8a45f51.patch + ------------------------------------------------------------------- Thu Jul 23 09:16:29 UTC 2020 - Marketa Calabkova diff --git a/python-vdirsyncer.spec b/python-vdirsyncer.spec index 3a87929..49bc30e 100644 --- a/python-vdirsyncer.spec +++ b/python-vdirsyncer.spec @@ -30,6 +30,8 @@ Source1: vdirsyncer.service Source2: vdirsyncer.timer # default deadline (200ms) is too short for obs Patch1: python-vdirsyncer-shift-deadline.patch +# Compatibility with latest click - taken directly from upstream git +Patch2: 3eb9ce5ae4320d52e6c876874511ff96a8a45f51.patch BuildRequires: %{python_module atomicwrites} BuildRequires: %{python_module setuptools_scm} BuildRequires: fdupes @@ -73,6 +75,7 @@ what OfflineIMAP is for IMAP. %prep %setup -q -n vdirsyncer-%{version} %patch1 -p1 +%patch2 -p1 rm -rf vdirsyncer.egg-info %build From b274f2cb63bb5a68dc694d977c11b07185642a2cec42a9b52713ba01f3f12110 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Sun, 28 Feb 2021 23:11:59 +0000 Subject: [PATCH 2/4] Accepting request 875834 from home:frispete:Tumbleweed - Fix source references OBS-URL: https://build.opensuse.org/request/show/875834 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-vdirsyncer?expand=0&rev=29 --- python-vdirsyncer.changes | 5 +++++ python-vdirsyncer.spec | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/python-vdirsyncer.changes b/python-vdirsyncer.changes index cda8f12..cf0df99 100644 --- a/python-vdirsyncer.changes +++ b/python-vdirsyncer.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Feb 28 22:24:56 UTC 2021 - Hans-Peter Jansen + +- Fix source references + ------------------------------------------------------------------- Tue Sep 1 15:11:22 UTC 2020 - Michal Hrusecky diff --git a/python-vdirsyncer.spec b/python-vdirsyncer.spec index 49bc30e..7371400 100644 --- a/python-vdirsyncer.spec +++ b/python-vdirsyncer.spec @@ -1,7 +1,7 @@ # # spec file for package python-vdirsyncer # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -87,8 +87,8 @@ rm -rf vdirsyncer.egg-info %python_expand %fdupes %{buildroot}/%{$python_sitelib} mkdir -p %{buildroot}%{_userunitdir} -install -Dpm 0644 %{SOURCE0} %{buildroot}%{_userunitdir}/vdirsyncer.service -install -Dpm 0644 %{SOURCE1} %{buildroot}%{_userunitdir}/vdirsyncer.timer +install -Dpm 0644 %{SOURCE1} %{buildroot}%{_userunitdir}/vdirsyncer.service +install -Dpm 0644 %{SOURCE2} %{buildroot}%{_userunitdir}/vdirsyncer.timer %check export DETERMINISTIC_TESTS=true From 36dd96afd84118b5d6ba5e8ac89b88e24f6b986338386de719a1ab293e44a744 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Fri, 12 Mar 2021 19:57:16 +0000 Subject: [PATCH 3/4] - Set up update-alternatives for systemd unit files. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-vdirsyncer?expand=0&rev=30 --- python-vdirsyncer.changes | 5 +++++ python-vdirsyncer.spec | 22 ++++++++++++++++------ 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/python-vdirsyncer.changes b/python-vdirsyncer.changes index cf0df99..0913ea6 100644 --- a/python-vdirsyncer.changes +++ b/python-vdirsyncer.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Mar 12 19:57:06 UTC 2021 - Matej Cepl + +- Set up update-alternatives for systemd unit files. + ------------------------------------------------------------------- Sun Feb 28 22:24:56 UTC 2021 - Hans-Peter Jansen diff --git a/python-vdirsyncer.spec b/python-vdirsyncer.spec index 7371400..1c19020 100644 --- a/python-vdirsyncer.spec +++ b/python-vdirsyncer.spec @@ -46,7 +46,7 @@ Requires: python-click-threading >= 0.2 Requires: python-requests >= 2.20.0 Requires: python-requests-toolbelt >= 0.4.0 Requires(post): update-alternatives -Requires(postun): update-alternatives +Requires(postun):update-alternatives Recommends: python-requests-oauthlib BuildArch: noarch # SECTION test requirements @@ -84,11 +84,15 @@ rm -rf vdirsyncer.egg-info %install %python_install %python_clone -a %{buildroot}%{_bindir}/vdirsyncer -%python_expand %fdupes %{buildroot}/%{$python_sitelib} mkdir -p %{buildroot}%{_userunitdir} -install -Dpm 0644 %{SOURCE1} %{buildroot}%{_userunitdir}/vdirsyncer.service -install -Dpm 0644 %{SOURCE2} %{buildroot}%{_userunitdir}/vdirsyncer.timer +%{python_expand \ +install -Dpm 0644 %{SOURCE1} %{buildroot}%{_userunitdir}/vdirsyncer-%{$python_bin_suffix}.service +install -Dpm 0644 %{SOURCE2} %{buildroot}%{_userunitdir}/vdirsyncer-%{$python_bin_suffix}.timer +%fdupes %{buildroot}/%{$python_sitelib} +} +%prepare_alternative -t %{_userunitdir}/vdirsyncer.service vdirsyncer.service +%prepare_alternative -t %{_userunitdir}/vdirsyncer.timer vdirsyncer.timer %check export DETERMINISTIC_TESTS=true @@ -96,7 +100,10 @@ export DETERMINISTIC_TESTS=true %pytest -k 'not test_legacy_status and not test_open_graphical_browser and not test_verbosity' %post -%python_install_alternative vdirsyncer +update-alternatives --install %{_bindir}/vdirsyncer vdirsyncer %{_bindir}/vdirsyncer-%{python_bin_suffix} %{python_version_nodots} \ + --slave %{_userunitdir}/vdirsyncer.service vdirsyncer.service %{_userunitdir}/vdirsyncer-%{python_bin_suffix}.service \ + --slave %{_userunitdir}/vdirsyncer.timer vdirsyncer.timer %{_userunitdir}/vdirsyncer-%{python_bin_suffix}.timer +update-alternatives --auto vdirsyncer %postun %python_uninstall_alternative vdirsyncer @@ -105,8 +112,11 @@ export DETERMINISTIC_TESTS=true %doc README.rst %license LICENSE %python_alternative %{_bindir}/vdirsyncer -%{python_sitelib}/* +%{python_sitelib}/vdirsyncer* +%{_userunitdir}/vdirsyncer-%{python_bin_suffix}.service +%{_userunitdir}/vdirsyncer-%{python_bin_suffix}.timer %{_userunitdir}/vdirsyncer.service %{_userunitdir}/vdirsyncer.timer +%ghost %{_sysconfdir}/alternatives/vdirsyncer* %changelog From 6aa7d125a5a5dff334479565a04b40b241d270198ccdcdc290a741a1f8403382 Mon Sep 17 00:00:00 2001 From: Steve Kowalik Date: Mon, 12 Apr 2021 07:00:01 +0000 Subject: [PATCH 4/4] - Remove ifpython3 macro guarding the Provides/Obsoletes OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-vdirsyncer?expand=0&rev=31 --- python-vdirsyncer.changes | 5 +++++ python-vdirsyncer.spec | 2 -- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/python-vdirsyncer.changes b/python-vdirsyncer.changes index 0913ea6..9fcf5c5 100644 --- a/python-vdirsyncer.changes +++ b/python-vdirsyncer.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Apr 12 06:56:05 UTC 2021 - Steve Kowalik + +- Remove ifpython3 macro guarding the Provides/Obsoletes + ------------------------------------------------------------------- Fri Mar 12 19:57:06 UTC 2021 - Matej Cepl diff --git a/python-vdirsyncer.spec b/python-vdirsyncer.spec index 1c19020..e0d2fb1 100644 --- a/python-vdirsyncer.spec +++ b/python-vdirsyncer.spec @@ -60,10 +60,8 @@ BuildRequires: %{python_module requests >= 2.20.0} BuildRequires: %{python_module requests-toolbelt >= 0.4.40} BuildRequires: %{python_module urllib3} # /SECTION -%ifpython3 Provides: vdirsyncer = %{version} Obsoletes: vdirsyncer < %{version} -%endif %python_subpackages %description