From f57f096f000c5e343eda8f35b5f02d7e21a02712 Mon Sep 17 00:00:00 2001 From: Michele Baldessari Date: Mon, 1 Aug 2016 20:57:35 +0200 Subject: [PATCH 01/72] New upstream --- sources | 2 +- vdirsyncer.spec | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 6ee6136..69e2beb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a2dc3e84992f3bd6614afcccfd87c31f vdirsyncer-0.11.2.tar.gz +83c8407ea4665145d4d72bd14e953c73 vdirsyncer-0.9.3.tar.gz diff --git a/vdirsyncer.spec b/vdirsyncer.spec index e030651..12d306a 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -16,13 +16,13 @@ %global _docdir_fmt %{name} Name: vdirsyncer -Version: 0.11.2 -Release: 2%{?git_tag}%{?dist} +Version: 0.11.3 +Release: 1%{?git_tag}%{?dist} Summary: %{sum} License: MIT URL: https://github.com/untitaker/%{name} -Source0: https://pypi.python.org/packages/6c/fb/20c32861134579fdce67060bf4cc074e171d30c70590137adc73924f94a6/%{name}-%{version}.tar.gz +Source0: https://pypi.python.org/packages/bf/71/e100bf18985b62d3b62c82fe7e673249c68f84767cb71f14013e30f6a5c6/%{name}-%{version}.tar.gz BuildArch: noarch BuildRequires: python-atomicwrites @@ -197,6 +197,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Mon Aug 01 2016 Michele Baldessari - 0.11.3-1 +- New upstream + * Sun Jun 19 2016 Michele Baldessari - 0.11.2-2 - Bump python-click-threading requirement From 9d661e6e9f20829abd1452168829d2bd7aafb8ad Mon Sep 17 00:00:00 2001 From: Michele Baldessari Date: Sun, 4 Sep 2016 10:02:47 +0200 Subject: [PATCH 02/72] New upstream --- .gitignore | 1 + sources | 2 +- vdirsyncer.spec | 23 +++++++++++++---------- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 880c41f..0a154ee 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /vdirsyncer-0.9.3.tar.gz /vdirsyncer-0.11.0.tar.gz /vdirsyncer-0.11.2.tar.gz +/vdirsyncer-0.12.1.tar.gz diff --git a/sources b/sources index 69e2beb..ed14463 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -83c8407ea4665145d4d72bd14e953c73 vdirsyncer-0.9.3.tar.gz +5375fa4e0e71ae5355862fc2cf557c32 vdirsyncer-0.12.1.tar.gz diff --git a/vdirsyncer.spec b/vdirsyncer.spec index fbc2aca..3677112 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -16,37 +16,37 @@ %global _docdir_fmt %{name} Name: vdirsyncer -Version: 0.11.3 +Version: 0.12.1 Release: 1%{?git_tag}%{?dist} Summary: %{sum} License: MIT URL: https://github.com/untitaker/%{name} -Source0: https://pypi.python.org/packages/bf/71/e100bf18985b62d3b62c82fe7e673249c68f84767cb71f14013e30f6a5c6/%{name}-%{version}.tar.gz +Source0: https://pypi.python.org/packages/63/c0/8f2305a3a4cf0ed0b30b430f90064139fed5ea6081a99798c27e62c0ed93/%{name}-%{version}.tar.gz BuildArch: noarch -BuildRequires: python-atomicwrites -BuildRequires: python-click -BuildRequires: python2-click-log +BuildRequires: python-atomicwrites >= 0.1.7 +BuildRequires: python-click >= 5.0 +BuildRequires: python2-click-log >= 0.1.3 BuildRequires: python2-click-threading >= 0.4.0 BuildRequires: python2-devel BuildRequires: python-icalendar BuildRequires: python-lxml -BuildRequires: python2-requests +BuildRequires: python2-requests >= 2.10 BuildRequires: python2-setuptools BuildRequires: python2-setuptools_scm BuildRequires: python2-sphinx BuildRequires: python2-sphinx_rtd_theme %if %{with python3} -BuildRequires: python3-atomicwrites -BuildRequires: python3-click -BuildRequires: python3-click-log +BuildRequires: python3-atomicwrites >= 0.1.7 +BuildRequires: python3-click >= 5.0 +BuildRequires: python3-click-log >= 0.1.3 BuildRequires: python3-click-threading >= 0.4.0 BuildRequires: python3-devel BuildRequires: python3-icalendar BuildRequires: python3-lxml -BuildRequires: python3-requests +BuildRequires: python3-requests >= 2.10 BuildRequires: python3-requests-oauthlib BuildRequires: python3-setuptools BuildRequires: python3-setuptools_scm @@ -197,6 +197,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Sun Sep 04 2016 Michele Baldessari - 0.12.1-1 +- New upstream + * Mon Aug 01 2016 Michele Baldessari - 0.11.3-1 - New upstream From 31fa67ddab54a82a21a77aa67b6fb1762f90f4de Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Sat, 8 Oct 2016 18:21:33 -0400 Subject: [PATCH 03/72] update to 0.13.1 --- .gitignore | 1 + sources | 2 +- vdirsyncer.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0a154ee..8c99815 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /vdirsyncer-0.11.0.tar.gz /vdirsyncer-0.11.2.tar.gz /vdirsyncer-0.12.1.tar.gz +/vdirsyncer-0.13.1.tar.gz diff --git a/sources b/sources index ed14463..631afdf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5375fa4e0e71ae5355862fc2cf557c32 vdirsyncer-0.12.1.tar.gz +88da877de1de71c2d78db0c3763802c2 vdirsyncer-0.13.1.tar.gz diff --git a/vdirsyncer.spec b/vdirsyncer.spec index 3677112..8f8da7e 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -16,13 +16,13 @@ %global _docdir_fmt %{name} Name: vdirsyncer -Version: 0.12.1 +Version: 0.13.1 Release: 1%{?git_tag}%{?dist} Summary: %{sum} License: MIT URL: https://github.com/untitaker/%{name} -Source0: https://pypi.python.org/packages/63/c0/8f2305a3a4cf0ed0b30b430f90064139fed5ea6081a99798c27e62c0ed93/%{name}-%{version}.tar.gz +Source0: https://pypi.python.org/packages/7f/0a/85dc78a0a83d7fcac59d15cb6ecd07ff81cc3fda0cc2a9e87ba23a35949e/vdirsyncer-0.13.1.tar.gz BuildArch: noarch BuildRequires: python-atomicwrites >= 0.1.7 @@ -197,6 +197,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Sat Oct 08 2016 Ben Boeckel - 0.13.1-1 +- update to 0.13.1 + * Sun Sep 04 2016 Michele Baldessari - 0.12.1-1 - New upstream From 182effc4f3456f51e6e49869881e1edf434f1112 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Sat, 8 Oct 2016 18:25:05 -0400 Subject: [PATCH 04/72] remove old, unused patch --- vdirsyncer-0.6.0-no-scm.patch | 16 ---------------- vdirsyncer.spec | 1 - 2 files changed, 17 deletions(-) delete mode 100644 vdirsyncer-0.6.0-no-scm.patch diff --git a/vdirsyncer-0.6.0-no-scm.patch b/vdirsyncer-0.6.0-no-scm.patch deleted file mode 100644 index 2baa1e1..0000000 --- a/vdirsyncer-0.6.0-no-scm.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -u -r -U5 --no-dereference vdirsyncer-0.6.0/setup.py vdirsyncer-0.6.0.no-scm/setup.py ---- vdirsyncer-0.6.0/setup.py 2015-07-28 09:11:30.000000000 -0400 -+++ vdirsyncer-0.6.0.no-scm/setup.py 2015-08-06 22:15:29.197425743 -0400 -@@ -16,11 +16,11 @@ - setup( - name='vdirsyncer', - use_scm_version={ - 'write_to': 'vdirsyncer/version.py', - }, -- setup_requires=['setuptools_scm'], -+ #setup_requires=['setuptools_scm'], - author='Markus Unterwaditzer', - author_email='markus@unterwaditzer.net', - url='https://github.com/untitaker/vdirsyncer', - description='Synchronize calendars and contacts', - license='MIT', diff --git a/vdirsyncer.spec b/vdirsyncer.spec index 8f8da7e..f2847f8 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -128,7 +128,6 @@ for the vdirsyncer calendar/address-book synchronization utility. %prep %setup -q -#%patch0 -p1 -b .no-scm %if %{with python3} rm -rf %{py3dir} From 34233e23c6888bc34a6ae2857b7305226ad7c1bf Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Sat, 8 Oct 2016 18:41:37 -0400 Subject: [PATCH 05/72] remove python2 support --- vdirsyncer.spec | 70 ------------------------------------------------- 1 file changed, 70 deletions(-) diff --git a/vdirsyncer.spec b/vdirsyncer.spec index f2847f8..143e62e 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -4,16 +4,9 @@ # above packages exist in Fedora %bcond_with tests -%if 0%{?fedora} -%bcond_without python3 -%else -%bcond_with python3 -%endif %global sum Synchronize calendars and contacts %global srcname vdirsyncer -# Share doc between python- and python3- -%global _docdir_fmt %{name} Name: vdirsyncer Version: 0.13.1 @@ -25,20 +18,6 @@ URL: https://github.com/untitaker/%{name} Source0: https://pypi.python.org/packages/7f/0a/85dc78a0a83d7fcac59d15cb6ecd07ff81cc3fda0cc2a9e87ba23a35949e/vdirsyncer-0.13.1.tar.gz BuildArch: noarch -BuildRequires: python-atomicwrites >= 0.1.7 -BuildRequires: python-click >= 5.0 -BuildRequires: python2-click-log >= 0.1.3 -BuildRequires: python2-click-threading >= 0.4.0 -BuildRequires: python2-devel -BuildRequires: python-icalendar -BuildRequires: python-lxml -BuildRequires: python2-requests >= 2.10 -BuildRequires: python2-setuptools -BuildRequires: python2-setuptools_scm -BuildRequires: python2-sphinx -BuildRequires: python2-sphinx_rtd_theme - -%if %{with python3} BuildRequires: python3-atomicwrites >= 0.1.7 BuildRequires: python3-click >= 5.0 BuildRequires: python3-click-log >= 0.1.3 @@ -52,9 +31,7 @@ BuildRequires: python3-setuptools BuildRequires: python3-setuptools_scm BuildRequires: python3-sphinx BuildRequires: python3-sphinx_rtd_theme -%endif -%if %{with python3} Requires: python3-atomicwrites >= 0.1.7 Requires: python3-click >= 5.0 Requires: python3-click-log >= 0.1.3 @@ -65,7 +42,6 @@ Requires: python3-requests >= 2.4.1 Requires: python3-requests-oauthlib Requires: python3-requests-toolbelt >= 0.4.0 Requires: python3-vdirsyncer = %{version} -%endif %description vdirsyncer synchronizes your calendars and address books between two entities. @@ -74,32 +50,10 @@ more. It aims to be for CalDAV and CardDAV what OfflineIMAP is for IMAP. -%package -n python2-%{srcname} -Summary: %{sum} -%{?python_provide:%python_provide python2-%{srcname}} - -Requires: python-atomicwrites >= 0.1.7 -Requires: python-click >= 5.0 -Requires: python2-click-log >= 0.1.3 -Requires: python2-click-threading >= 0.4.0 -Requires: python-icalendar -Requires: python-lxml >= 3.1 -Requires: python2-requests >= 2.4.1 -Requires: python2-requests-toolbelt >= 0.4.0 - -%description -n python2-%{srcname} -vdirsyncer synchronizes your calendars and address books between two entities. -The supported protocols are CalDAV, CardDAV, arbitrary HTTP resources and some -more. - -It aims to be for CalDAV and CardDAV what OfflineIMAP is for IMAP. -This package contains the python2 modules. - %package -n python3-%{srcname} Summary: %{sum} %{?python_provide:%python_provide python3-%{srcname}} -%if %{with python3} Requires: python3-atomicwrites >= 0.1.7 Requires: python3-click >= 5.0 Requires: python3-click-log >= 0.1.3 @@ -109,7 +63,6 @@ Requires: python3-lxml >= 3.1 Requires: python3-requests >= 2.4.1 Requires: python3-requests-oauthlib Requires: python3-requests-toolbelt >= 0.4.0 -%endif %description -n python3-%{srcname} vdirsyncer synchronizes your calendars and address books between two entities. @@ -129,13 +82,7 @@ for the vdirsyncer calendar/address-book synchronization utility. %prep %setup -q -%if %{with python3} -rm -rf %{py3dir} -cp -a . %{py3dir} -%endif - %build -%py2_build # Custom sphinx docs need to import vdirsyncer classes from the untarred # source tree export PYTHONPATH=`pwd` @@ -149,20 +96,11 @@ unset PYTHONPATH rm -vrf docs/_build/html/_sources rm -fv docs/_build/html/{.buildinfo,objects.inv} -%if %{with python3} -pushd %{py3dir} %py3_build -popd -%endif %install -%py2_install -%if %{with python3} -pushd %{py3dir} %py3_install -popd -%endif install -d "$RPM_BUILD_ROOT%{_mandir}/man1" cp -r docs/_build/man/%{name}.1 "$RPM_BUILD_ROOT%{_mandir}/man1" @@ -172,14 +110,6 @@ cp -r docs/_build/man/%{name}.1 "$RPM_BUILD_ROOT%{_mandir}/man1" sh build.sh tests %endif -%files -n python2-%{srcname} -%license LICENSE -%doc AUTHORS.rst README.rst CONTRIBUTING.rst -%{python2_sitelib}/* -# If you need the vdirsyncer CLI install the python3 variant -#%{_bindir}/vdirsyncer -%{_mandir}/man1/%{name}.1.* - %files -n python3-%{srcname} %license LICENSE %doc AUTHORS.rst README.rst CONTRIBUTING.rst From 62fa3159e1c790b8f3032e31ee6b89ac8d61bea2 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Sat, 8 Oct 2016 18:42:12 -0400 Subject: [PATCH 06/72] Revert "update to 0.13.1" and "remove python2 support" This reverts commits 31fa67ddab54a82a21a77aa67b6fb1762f90f4de and 34233e23c6888bc34a6ae2857b7305226ad7c1bf. This update removed Python2 support; revert it for now. --- .gitignore | 1 - sources | 2 +- vdirsyncer.spec | 77 +++++++++++++++++++++++++++++++++++++++++++++---- 3 files changed, 73 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 8c99815..0a154ee 100644 --- a/.gitignore +++ b/.gitignore @@ -10,4 +10,3 @@ /vdirsyncer-0.11.0.tar.gz /vdirsyncer-0.11.2.tar.gz /vdirsyncer-0.12.1.tar.gz -/vdirsyncer-0.13.1.tar.gz diff --git a/sources b/sources index 631afdf..ed14463 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -88da877de1de71c2d78db0c3763802c2 vdirsyncer-0.13.1.tar.gz +5375fa4e0e71ae5355862fc2cf557c32 vdirsyncer-0.12.1.tar.gz diff --git a/vdirsyncer.spec b/vdirsyncer.spec index 143e62e..c7cc976 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -4,20 +4,41 @@ # above packages exist in Fedora %bcond_with tests +%if 0%{?fedora} +%bcond_without python3 +%else +%bcond_with python3 +%endif %global sum Synchronize calendars and contacts %global srcname vdirsyncer +# Share doc between python- and python3- +%global _docdir_fmt %{name} Name: vdirsyncer -Version: 0.13.1 +Version: 0.12.1 Release: 1%{?git_tag}%{?dist} Summary: %{sum} License: MIT URL: https://github.com/untitaker/%{name} -Source0: https://pypi.python.org/packages/7f/0a/85dc78a0a83d7fcac59d15cb6ecd07ff81cc3fda0cc2a9e87ba23a35949e/vdirsyncer-0.13.1.tar.gz +Source0: https://pypi.python.org/packages/63/c0/8f2305a3a4cf0ed0b30b430f90064139fed5ea6081a99798c27e62c0ed93/%{name}-%{version}.tar.gz BuildArch: noarch +BuildRequires: python-atomicwrites >= 0.1.7 +BuildRequires: python-click >= 5.0 +BuildRequires: python2-click-log >= 0.1.3 +BuildRequires: python2-click-threading >= 0.4.0 +BuildRequires: python2-devel +BuildRequires: python-icalendar +BuildRequires: python-lxml +BuildRequires: python2-requests >= 2.10 +BuildRequires: python2-setuptools +BuildRequires: python2-setuptools_scm +BuildRequires: python2-sphinx +BuildRequires: python2-sphinx_rtd_theme + +%if %{with python3} BuildRequires: python3-atomicwrites >= 0.1.7 BuildRequires: python3-click >= 5.0 BuildRequires: python3-click-log >= 0.1.3 @@ -31,7 +52,9 @@ BuildRequires: python3-setuptools BuildRequires: python3-setuptools_scm BuildRequires: python3-sphinx BuildRequires: python3-sphinx_rtd_theme +%endif +%if %{with python3} Requires: python3-atomicwrites >= 0.1.7 Requires: python3-click >= 5.0 Requires: python3-click-log >= 0.1.3 @@ -42,6 +65,7 @@ Requires: python3-requests >= 2.4.1 Requires: python3-requests-oauthlib Requires: python3-requests-toolbelt >= 0.4.0 Requires: python3-vdirsyncer = %{version} +%endif %description vdirsyncer synchronizes your calendars and address books between two entities. @@ -50,10 +74,32 @@ more. It aims to be for CalDAV and CardDAV what OfflineIMAP is for IMAP. +%package -n python2-%{srcname} +Summary: %{sum} +%{?python_provide:%python_provide python2-%{srcname}} + +Requires: python-atomicwrites >= 0.1.7 +Requires: python-click >= 5.0 +Requires: python2-click-log >= 0.1.3 +Requires: python2-click-threading >= 0.4.0 +Requires: python-icalendar +Requires: python-lxml >= 3.1 +Requires: python2-requests >= 2.4.1 +Requires: python2-requests-toolbelt >= 0.4.0 + +%description -n python2-%{srcname} +vdirsyncer synchronizes your calendars and address books between two entities. +The supported protocols are CalDAV, CardDAV, arbitrary HTTP resources and some +more. + +It aims to be for CalDAV and CardDAV what OfflineIMAP is for IMAP. +This package contains the python2 modules. + %package -n python3-%{srcname} Summary: %{sum} %{?python_provide:%python_provide python3-%{srcname}} +%if %{with python3} Requires: python3-atomicwrites >= 0.1.7 Requires: python3-click >= 5.0 Requires: python3-click-log >= 0.1.3 @@ -63,6 +109,7 @@ Requires: python3-lxml >= 3.1 Requires: python3-requests >= 2.4.1 Requires: python3-requests-oauthlib Requires: python3-requests-toolbelt >= 0.4.0 +%endif %description -n python3-%{srcname} vdirsyncer synchronizes your calendars and address books between two entities. @@ -82,7 +129,13 @@ for the vdirsyncer calendar/address-book synchronization utility. %prep %setup -q +%if %{with python3} +rm -rf %{py3dir} +cp -a . %{py3dir} +%endif + %build +%py2_build # Custom sphinx docs need to import vdirsyncer classes from the untarred # source tree export PYTHONPATH=`pwd` @@ -96,11 +149,20 @@ unset PYTHONPATH rm -vrf docs/_build/html/_sources rm -fv docs/_build/html/{.buildinfo,objects.inv} +%if %{with python3} +pushd %{py3dir} %py3_build +popd +%endif %install +%py2_install +%if %{with python3} +pushd %{py3dir} %py3_install +popd +%endif install -d "$RPM_BUILD_ROOT%{_mandir}/man1" cp -r docs/_build/man/%{name}.1 "$RPM_BUILD_ROOT%{_mandir}/man1" @@ -110,6 +172,14 @@ cp -r docs/_build/man/%{name}.1 "$RPM_BUILD_ROOT%{_mandir}/man1" sh build.sh tests %endif +%files -n python2-%{srcname} +%license LICENSE +%doc AUTHORS.rst README.rst CONTRIBUTING.rst +%{python2_sitelib}/* +# If you need the vdirsyncer CLI install the python3 variant +#%{_bindir}/vdirsyncer +%{_mandir}/man1/%{name}.1.* + %files -n python3-%{srcname} %license LICENSE %doc AUTHORS.rst README.rst CONTRIBUTING.rst @@ -126,9 +196,6 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog -* Sat Oct 08 2016 Ben Boeckel - 0.13.1-1 -- update to 0.13.1 - * Sun Sep 04 2016 Michele Baldessari - 0.12.1-1 - New upstream From 0176f61500558e3bfea65df6bb2ef5dbcaca0b7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 19 Dec 2016 18:20:38 +0100 Subject: [PATCH 07/72] Rebuild for Python 3.6 --- vdirsyncer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdirsyncer.spec b/vdirsyncer.spec index c7cc976..b1308c3 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -17,7 +17,7 @@ Name: vdirsyncer Version: 0.12.1 -Release: 1%{?git_tag}%{?dist} +Release: 2%{?git_tag}%{?dist} Summary: %{sum} License: MIT @@ -196,6 +196,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Mon Dec 19 2016 Miro Hrončok - 0.12.1-2 +- Rebuild for Python 3.6 + * Sun Sep 04 2016 Michele Baldessari - 0.12.1-1 - New upstream From 0c370c6f8cfe828215563f68c7c504bc2e20145e Mon Sep 17 00:00:00 2001 From: Michele Baldessari Date: Wed, 28 Dec 2016 10:17:59 +0100 Subject: [PATCH 08/72] New upstream Since 0.13.0 there is no longer python2 support, so drop it and obsolete python2-vdirsyncer --- .gitignore | 1 + sources | 2 +- vdirsyncer.spec | 85 ++++++------------------------------------------- 3 files changed, 12 insertions(+), 76 deletions(-) diff --git a/.gitignore b/.gitignore index 0a154ee..e899410 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /vdirsyncer-0.11.0.tar.gz /vdirsyncer-0.11.2.tar.gz /vdirsyncer-0.12.1.tar.gz +/vdirsyncer-0.14.0.tar.gz diff --git a/sources b/sources index ed14463..f59b22c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5375fa4e0e71ae5355862fc2cf557c32 vdirsyncer-0.12.1.tar.gz +SHA512 (vdirsyncer-0.14.0.tar.gz) = e8a9f74032bc625db60206a210d7c00fad224b7eccfd1caeabbb97b443fd90ae8a00e2fdfabfd6118864dd9b6d8922eb9906091a8e341334848f66e55ed5fcdd diff --git a/vdirsyncer.spec b/vdirsyncer.spec index b1308c3..13cc158 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -3,42 +3,22 @@ # for them to work. Will also need BR: pystest once the two # above packages exist in Fedora -%bcond_with tests -%if 0%{?fedora} -%bcond_without python3 -%else -%bcond_with python3 -%endif - %global sum Synchronize calendars and contacts %global srcname vdirsyncer # Share doc between python- and python3- %global _docdir_fmt %{name} Name: vdirsyncer -Version: 0.12.1 -Release: 2%{?git_tag}%{?dist} +Version: 0.14.0 +Release: 1%{?git_tag}%{?dist} Summary: %{sum} License: MIT URL: https://github.com/untitaker/%{name} -Source0: https://pypi.python.org/packages/63/c0/8f2305a3a4cf0ed0b30b430f90064139fed5ea6081a99798c27e62c0ed93/%{name}-%{version}.tar.gz +Source0: https://pypi.python.org/packages/9a/46/c870edb9e85ff884c6d8833abac1ae86af5b4302b8615dc7dda943569356/%{name}-%{version}.tar.gz BuildArch: noarch +Obsoletes: python2-%{srcname} <= 0.12.1 -BuildRequires: python-atomicwrites >= 0.1.7 -BuildRequires: python-click >= 5.0 -BuildRequires: python2-click-log >= 0.1.3 -BuildRequires: python2-click-threading >= 0.4.0 -BuildRequires: python2-devel -BuildRequires: python-icalendar -BuildRequires: python-lxml -BuildRequires: python2-requests >= 2.10 -BuildRequires: python2-setuptools -BuildRequires: python2-setuptools_scm -BuildRequires: python2-sphinx -BuildRequires: python2-sphinx_rtd_theme - -%if %{with python3} BuildRequires: python3-atomicwrites >= 0.1.7 BuildRequires: python3-click >= 5.0 BuildRequires: python3-click-log >= 0.1.3 @@ -52,9 +32,7 @@ BuildRequires: python3-setuptools BuildRequires: python3-setuptools_scm BuildRequires: python3-sphinx BuildRequires: python3-sphinx_rtd_theme -%endif -%if %{with python3} Requires: python3-atomicwrites >= 0.1.7 Requires: python3-click >= 5.0 Requires: python3-click-log >= 0.1.3 @@ -65,7 +43,6 @@ Requires: python3-requests >= 2.4.1 Requires: python3-requests-oauthlib Requires: python3-requests-toolbelt >= 0.4.0 Requires: python3-vdirsyncer = %{version} -%endif %description vdirsyncer synchronizes your calendars and address books between two entities. @@ -74,32 +51,10 @@ more. It aims to be for CalDAV and CardDAV what OfflineIMAP is for IMAP. -%package -n python2-%{srcname} -Summary: %{sum} -%{?python_provide:%python_provide python2-%{srcname}} - -Requires: python-atomicwrites >= 0.1.7 -Requires: python-click >= 5.0 -Requires: python2-click-log >= 0.1.3 -Requires: python2-click-threading >= 0.4.0 -Requires: python-icalendar -Requires: python-lxml >= 3.1 -Requires: python2-requests >= 2.4.1 -Requires: python2-requests-toolbelt >= 0.4.0 - -%description -n python2-%{srcname} -vdirsyncer synchronizes your calendars and address books between two entities. -The supported protocols are CalDAV, CardDAV, arbitrary HTTP resources and some -more. - -It aims to be for CalDAV and CardDAV what OfflineIMAP is for IMAP. -This package contains the python2 modules. - %package -n python3-%{srcname} Summary: %{sum} %{?python_provide:%python_provide python3-%{srcname}} -%if %{with python3} Requires: python3-atomicwrites >= 0.1.7 Requires: python3-click >= 5.0 Requires: python3-click-log >= 0.1.3 @@ -109,7 +64,6 @@ Requires: python3-lxml >= 3.1 Requires: python3-requests >= 2.4.1 Requires: python3-requests-oauthlib Requires: python3-requests-toolbelt >= 0.4.0 -%endif %description -n python3-%{srcname} vdirsyncer synchronizes your calendars and address books between two entities. @@ -129,13 +83,9 @@ for the vdirsyncer calendar/address-book synchronization utility. %prep %setup -q -%if %{with python3} -rm -rf %{py3dir} -cp -a . %{py3dir} -%endif - %build -%py2_build +%py3_build + # Custom sphinx docs need to import vdirsyncer classes from the untarred # source tree export PYTHONPATH=`pwd` @@ -149,20 +99,9 @@ unset PYTHONPATH rm -vrf docs/_build/html/_sources rm -fv docs/_build/html/{.buildinfo,objects.inv} -%if %{with python3} -pushd %{py3dir} -%py3_build -popd -%endif - %install -%py2_install -%if %{with python3} -pushd %{py3dir} %py3_install -popd -%endif install -d "$RPM_BUILD_ROOT%{_mandir}/man1" cp -r docs/_build/man/%{name}.1 "$RPM_BUILD_ROOT%{_mandir}/man1" @@ -172,14 +111,6 @@ cp -r docs/_build/man/%{name}.1 "$RPM_BUILD_ROOT%{_mandir}/man1" sh build.sh tests %endif -%files -n python2-%{srcname} -%license LICENSE -%doc AUTHORS.rst README.rst CONTRIBUTING.rst -%{python2_sitelib}/* -# If you need the vdirsyncer CLI install the python3 variant -#%{_bindir}/vdirsyncer -%{_mandir}/man1/%{name}.1.* - %files -n python3-%{srcname} %license LICENSE %doc AUTHORS.rst README.rst CONTRIBUTING.rst @@ -196,6 +127,10 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Wed Dec 28 2016 Michele Baldessari - 0.14.0-1 +- New upstream +- Since 0.13.0 there is no longer python2 support, so drop it and obsolete python2-vdirsyncer + * Mon Dec 19 2016 Miro Hrončok - 0.12.1-2 - Rebuild for Python 3.6 From e614dad77df33999d49d108334837d46cf4653e3 Mon Sep 17 00:00:00 2001 From: Michele Baldessari Date: Sun, 8 Jan 2017 10:00:24 +0100 Subject: [PATCH 09/72] New upstream --- .gitignore | 1 + sources | 2 +- vdirsyncer.spec | 8 ++++++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e899410..be82afc 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /vdirsyncer-0.11.2.tar.gz /vdirsyncer-0.12.1.tar.gz /vdirsyncer-0.14.0.tar.gz +/vdirsyncer-0.14.1.tar.gz diff --git a/sources b/sources index f59b22c..ebf5f8c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdirsyncer-0.14.0.tar.gz) = e8a9f74032bc625db60206a210d7c00fad224b7eccfd1caeabbb97b443fd90ae8a00e2fdfabfd6118864dd9b6d8922eb9906091a8e341334848f66e55ed5fcdd +SHA512 (vdirsyncer-0.14.1.tar.gz) = 5c0b0fbd1ba3df9d2291d2ac77c0a330f0908a7b7b9685dab994d7092d72a198555b36d9023fb4030344968fc9dc68c4acda8632a8cbb98ceaff64929ac38bb4 diff --git a/vdirsyncer.spec b/vdirsyncer.spec index 13cc158..8edd2db 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -9,13 +9,13 @@ %global _docdir_fmt %{name} Name: vdirsyncer -Version: 0.14.0 +Version: 0.14.1 Release: 1%{?git_tag}%{?dist} Summary: %{sum} License: MIT URL: https://github.com/untitaker/%{name} -Source0: https://pypi.python.org/packages/9a/46/c870edb9e85ff884c6d8833abac1ae86af5b4302b8615dc7dda943569356/%{name}-%{version}.tar.gz +Source0: https://pypi.python.org/packages/7f/3b/24b44d91eb591f75a658928fc228cbe6571d499a8778730f9ddae389ca5e/%{name}-%{version}.tar.gz BuildArch: noarch Obsoletes: python2-%{srcname} <= 0.12.1 @@ -28,6 +28,7 @@ BuildRequires: python3-icalendar BuildRequires: python3-lxml BuildRequires: python3-requests >= 2.10 BuildRequires: python3-requests-oauthlib +BuildRequires: python3-requests-toolbelt >= 0.4.0 BuildRequires: python3-setuptools BuildRequires: python3-setuptools_scm BuildRequires: python3-sphinx @@ -127,6 +128,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Sun Jan 08 2017 Michele Baldessari - 0.14.1-1 +- New upstream + * Wed Dec 28 2016 Michele Baldessari - 0.14.0-1 - New upstream - Since 0.13.0 there is no longer python2 support, so drop it and obsolete python2-vdirsyncer From 8ff96ae4a3c075747b7fc57f011fc09a2d8ed6f0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 16:57:56 +0000 Subject: [PATCH 10/72] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- vdirsyncer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdirsyncer.spec b/vdirsyncer.spec index 8edd2db..0d36720 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -10,7 +10,7 @@ Name: vdirsyncer Version: 0.14.1 -Release: 1%{?git_tag}%{?dist} +Release: 2%{?git_tag}%{?dist} Summary: %{sum} License: MIT @@ -128,6 +128,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 0.14.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Sun Jan 08 2017 Michele Baldessari - 0.14.1-1 - New upstream From 060cb2b685a0aa18e7d26443f6863d3550f658ba Mon Sep 17 00:00:00 2001 From: Michele Baldessari Date: Mon, 10 Jul 2017 18:34:33 +0200 Subject: [PATCH 11/72] New upstream --- .gitignore | 1 + sources | 2 +- vdirsyncer.spec | 8 ++++++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index be82afc..80f8b66 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /vdirsyncer-0.12.1.tar.gz /vdirsyncer-0.14.0.tar.gz /vdirsyncer-0.14.1.tar.gz +/vdirsyncer-0.16.0.tar.gz diff --git a/sources b/sources index ebf5f8c..cfa249e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdirsyncer-0.14.1.tar.gz) = 5c0b0fbd1ba3df9d2291d2ac77c0a330f0908a7b7b9685dab994d7092d72a198555b36d9023fb4030344968fc9dc68c4acda8632a8cbb98ceaff64929ac38bb4 +SHA512 (vdirsyncer-0.16.0.tar.gz) = d15a78d49da8ec033be85a3b127d5a788d34ba160207068f9cbd038efd950df809222da9b26ded46f53898b59c8e22049ca003c593e5ce4153ba744e9cf94dd4 diff --git a/vdirsyncer.spec b/vdirsyncer.spec index 8edd2db..81cd4bb 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -9,13 +9,14 @@ %global _docdir_fmt %{name} Name: vdirsyncer -Version: 0.14.1 +Version: 0.16.0 Release: 1%{?git_tag}%{?dist} Summary: %{sum} License: MIT URL: https://github.com/untitaker/%{name} -Source0: https://pypi.python.org/packages/7f/3b/24b44d91eb591f75a658928fc228cbe6571d499a8778730f9ddae389ca5e/%{name}-%{version}.tar.gz +Source0: https://pypi.python.org/packages/57/12/bc6f6b65545acec0d4d86a6128324e9cb55930fea8061a0adb7d234d0aaf/%{name}-%{version}.tar.gz + BuildArch: noarch Obsoletes: python2-%{srcname} <= 0.12.1 @@ -128,6 +129,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Mon Jul 10 2017 Michele Baldessari - 0.16.0-1 +- New upstream + * Sun Jan 08 2017 Michele Baldessari - 0.14.1-1 - New upstream From 0416cf26e094bdf24f823cf5c98c0d2daa53e7b3 Mon Sep 17 00:00:00 2001 From: Michele Baldessari Date: Mon, 10 Jul 2017 18:38:06 +0200 Subject: [PATCH 12/72] New upstream License is now BSD Require sqlite3 --- vdirsyncer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdirsyncer.spec b/vdirsyncer.spec index 81cd4bb..6d905fc 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -13,7 +13,7 @@ Version: 0.16.0 Release: 1%{?git_tag}%{?dist} Summary: %{sum} -License: MIT +License: BSD URL: https://github.com/untitaker/%{name} Source0: https://pypi.python.org/packages/57/12/bc6f6b65545acec0d4d86a6128324e9cb55930fea8061a0adb7d234d0aaf/%{name}-%{version}.tar.gz @@ -45,6 +45,7 @@ Requires: python3-requests >= 2.4.1 Requires: python3-requests-oauthlib Requires: python3-requests-toolbelt >= 0.4.0 Requires: python3-vdirsyncer = %{version} +Requires: sqlite %description vdirsyncer synchronizes your calendars and address books between two entities. @@ -131,6 +132,8 @@ sh build.sh tests %changelog * Mon Jul 10 2017 Michele Baldessari - 0.16.0-1 - New upstream +- License is now BSD +- Require sqlite3 * Sun Jan 08 2017 Michele Baldessari - 0.14.1-1 - New upstream From 9c48a850dbbe45f82bc4b215faeec04b3f1220e8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 21:12:25 +0000 Subject: [PATCH 13/72] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- vdirsyncer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdirsyncer.spec b/vdirsyncer.spec index 6fc4ebb..b0b5c8a 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -10,7 +10,7 @@ Name: vdirsyncer Version: 0.16.0 -Release: 1%{?git_tag}%{?dist} +Release: 2%{?git_tag}%{?dist} Summary: %{sum} License: BSD @@ -130,6 +130,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 0.16.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Mon Jul 10 2017 Michele Baldessari - 0.16.0-1 - New upstream - License is now BSD From 341fbbea0425930b119a25e4fdd2d98855ac4006 Mon Sep 17 00:00:00 2001 From: Michele Baldessari Date: Thu, 24 Aug 2017 16:52:40 +0200 Subject: [PATCH 14/72] New upstream --- .gitignore | 1 + sources | 2 +- vdirsyncer.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 80f8b66..30669c5 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /vdirsyncer-0.14.0.tar.gz /vdirsyncer-0.14.1.tar.gz /vdirsyncer-0.16.0.tar.gz +/vdirsyncer-0.16.2.tar.gz diff --git a/sources b/sources index cfa249e..8bc668c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdirsyncer-0.16.0.tar.gz) = d15a78d49da8ec033be85a3b127d5a788d34ba160207068f9cbd038efd950df809222da9b26ded46f53898b59c8e22049ca003c593e5ce4153ba744e9cf94dd4 +SHA512 (vdirsyncer-0.16.2.tar.gz) = 24f423c113402d8541020bdb199ab14b3262f20c0fe81a69f9fd5000aac30ab6faf035e112c6e60811486c58cda0333ce4999cf13f0a5aa19ce287f2d924dad1 diff --git a/vdirsyncer.spec b/vdirsyncer.spec index 6fc4ebb..bcaedfe 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -9,13 +9,13 @@ %global _docdir_fmt %{name} Name: vdirsyncer -Version: 0.16.0 +Version: 0.16.2 Release: 1%{?git_tag}%{?dist} Summary: %{sum} License: BSD URL: https://github.com/untitaker/%{name} -Source0: https://pypi.python.org/packages/57/12/bc6f6b65545acec0d4d86a6128324e9cb55930fea8061a0adb7d234d0aaf/%{name}-%{version}.tar.gz +Source0: https://pypi.python.org/packages/64/b2/54e89acbe898a9527bb1f3f0bb9c7a93005dcf94055d1f520b8cd0f3bbcb/%{name}-%{version}.tar.gz BuildArch: noarch Obsoletes: python2-%{srcname} <= 0.12.1 @@ -130,6 +130,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Thu Aug 24 2017 Michele Baldessari - 0.16.2-1 +- New upstream + * Mon Jul 10 2017 Michele Baldessari - 0.16.0-1 - New upstream - License is now BSD From 76a982b5b06c0dfb87b86f698637af5e7469b0c8 Mon Sep 17 00:00:00 2001 From: Michele Baldessari Date: Wed, 4 Oct 2017 07:44:01 +0200 Subject: [PATCH 15/72] New upstream --- vdirsyncer.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vdirsyncer.spec b/vdirsyncer.spec index 478574f..e1d70b5 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -9,13 +9,13 @@ %global _docdir_fmt %{name} Name: vdirsyncer -Version: 0.16.2 +Version: 0.16.3 Release: 1%{?git_tag}%{?dist} Summary: %{sum} License: BSD URL: https://github.com/untitaker/%{name} -Source0: https://pypi.python.org/packages/64/b2/54e89acbe898a9527bb1f3f0bb9c7a93005dcf94055d1f520b8cd0f3bbcb/%{name}-%{version}.tar.gz +Source0: https://pypi.python.org/packages/89/61/c1e7d46487f6ed33fbd7c1ae8c55887b07469e47c700e3f4dc9a6627dcbd/vdirsyncer-0.16.3.tar.gz BuildArch: noarch Obsoletes: python2-%{srcname} <= 0.12.1 @@ -130,6 +130,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Tue Oct 03 2017 Michele Baldessari - 0.16.3-1 +- New upstream + * Thu Aug 24 2017 Michele Baldessari - 0.16.2-1 - New upstream From 836564a22626facdc5b5736e99b96bd657699489 Mon Sep 17 00:00:00 2001 From: Michele Baldessari Date: Wed, 4 Oct 2017 07:49:53 +0200 Subject: [PATCH 16/72] New upstream --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 30669c5..a191e13 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /vdirsyncer-0.14.1.tar.gz /vdirsyncer-0.16.0.tar.gz /vdirsyncer-0.16.2.tar.gz +/vdirsyncer-0.16.3.tar.gz diff --git a/sources b/sources index 8bc668c..178445e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdirsyncer-0.16.2.tar.gz) = 24f423c113402d8541020bdb199ab14b3262f20c0fe81a69f9fd5000aac30ab6faf035e112c6e60811486c58cda0333ce4999cf13f0a5aa19ce287f2d924dad1 +SHA512 (vdirsyncer-0.16.3.tar.gz) = 8f71cc71527d68836405722b4be03695b9010f72729c1c9b6d0199996bcf6821628a26297ff2d3a45047910618d570566e00edefccc428d29ba9fc9033caddff From 3a3f8656552ed10dfa17a051b1bd8f52f6805252 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 20:21:24 +0000 Subject: [PATCH 17/72] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vdirsyncer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdirsyncer.spec b/vdirsyncer.spec index e1d70b5..a13005a 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -10,7 +10,7 @@ Name: vdirsyncer Version: 0.16.3 -Release: 1%{?git_tag}%{?dist} +Release: 2%{?git_tag}%{?dist} Summary: %{sum} License: BSD @@ -130,6 +130,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 0.16.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Tue Oct 03 2017 Michele Baldessari - 0.16.3-1 - New upstream From a2a4b21204c2b3662c910cc73edcffdb8905ca0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 19 Jun 2018 11:30:06 +0200 Subject: [PATCH 18/72] Rebuilt for Python 3.7 --- vdirsyncer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdirsyncer.spec b/vdirsyncer.spec index a13005a..d4c33fd 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -10,7 +10,7 @@ Name: vdirsyncer Version: 0.16.3 -Release: 2%{?git_tag}%{?dist} +Release: 3%{?git_tag}%{?dist} Summary: %{sum} License: BSD @@ -130,6 +130,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Tue Jun 19 2018 Miro Hrončok - 0.16.3-3 +- Rebuilt for Python 3.7 + * Fri Feb 09 2018 Fedora Release Engineering - 0.16.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 1da56d1ae898c36c0041f574567f9c9997fe40b4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 08:26:32 +0000 Subject: [PATCH 19/72] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vdirsyncer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdirsyncer.spec b/vdirsyncer.spec index d4c33fd..7418734 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -10,7 +10,7 @@ Name: vdirsyncer Version: 0.16.3 -Release: 3%{?git_tag}%{?dist} +Release: 4%{?git_tag}%{?dist} Summary: %{sum} License: BSD @@ -130,6 +130,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 0.16.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Tue Jun 19 2018 Miro Hrončok - 0.16.3-3 - Rebuilt for Python 3.7 From c1d823120ff1722b2f5e0c22169cccaccd755b48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Floure?= Date: Thu, 15 Nov 2018 08:26:18 +0100 Subject: [PATCH 20/72] New upstream release: update to 0.16.7 --- .gitignore | 1 + sources | 2 +- vdirsyncer.spec | 16 ++++++++++------ 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index a191e13..bf0152c 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /vdirsyncer-0.16.0.tar.gz /vdirsyncer-0.16.2.tar.gz /vdirsyncer-0.16.3.tar.gz +/vdirsyncer-0.16.7.tar.gz diff --git a/sources b/sources index 178445e..ed27b19 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdirsyncer-0.16.3.tar.gz) = 8f71cc71527d68836405722b4be03695b9010f72729c1c9b6d0199996bcf6821628a26297ff2d3a45047910618d570566e00edefccc428d29ba9fc9033caddff +SHA512 (vdirsyncer-0.16.7.tar.gz) = 218c6781139a9e979077308dc732756cc27ecb67966e4b52be31cb1ebf04d224443036102d5c4bad253b9dcf533939f0b72082166f0fe94e042a7e946b8fad0e diff --git a/vdirsyncer.spec b/vdirsyncer.spec index 7418734..27a92aa 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -9,20 +9,20 @@ %global _docdir_fmt %{name} Name: vdirsyncer -Version: 0.16.3 -Release: 4%{?git_tag}%{?dist} +Version: 0.16.7 +Release: 1%{?git_tag}%{?dist} Summary: %{sum} License: BSD URL: https://github.com/untitaker/%{name} -Source0: https://pypi.python.org/packages/89/61/c1e7d46487f6ed33fbd7c1ae8c55887b07469e47c700e3f4dc9a6627dcbd/vdirsyncer-0.16.3.tar.gz +Source0: %pypi_source BuildArch: noarch Obsoletes: python2-%{srcname} <= 0.12.1 BuildRequires: python3-atomicwrites >= 0.1.7 BuildRequires: python3-click >= 5.0 -BuildRequires: python3-click-log >= 0.1.3 +BuildRequires: python3-click-log >= 0.3 BuildRequires: python3-click-threading >= 0.4.0 BuildRequires: python3-devel BuildRequires: python3-icalendar @@ -37,7 +37,7 @@ BuildRequires: python3-sphinx_rtd_theme Requires: python3-atomicwrites >= 0.1.7 Requires: python3-click >= 5.0 -Requires: python3-click-log >= 0.1.3 +Requires: python3-click-log >= 0.3 Requires: python3-click-threading >= 0.4.0 Requires: python3-icalendar Requires: python3-lxml >= 3.1 @@ -60,7 +60,7 @@ Summary: %{sum} Requires: python3-atomicwrites >= 0.1.7 Requires: python3-click >= 5.0 -Requires: python3-click-log >= 0.1.3 +Requires: python3-click-log >= 0.3 Requires: python3-click-threading >= 0.4.0 Requires: python3-icalendar Requires: python3-lxml >= 3.1 @@ -130,6 +130,10 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Thu Nov 15 2018 Timothée Floure - 0.16.7-1 +- New upstream release +- Use the proper pypi_source macro to define the source tag + * Sat Jul 14 2018 Fedora Release Engineering - 0.16.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 533efff33b98522dba1ef93e33d21aaa5aa7e1a7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 11:08:04 +0000 Subject: [PATCH 21/72] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vdirsyncer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdirsyncer.spec b/vdirsyncer.spec index 27a92aa..f1de95f 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -10,7 +10,7 @@ Name: vdirsyncer Version: 0.16.7 -Release: 1%{?git_tag}%{?dist} +Release: 2%{?git_tag}%{?dist} Summary: %{sum} License: BSD @@ -130,6 +130,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 0.16.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Thu Nov 15 2018 Timothée Floure - 0.16.7-1 - New upstream release - Use the proper pypi_source macro to define the source tag From 054b66617269e18dfebf3b7cdc429ef4e64d7c5d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 02:49:45 +0000 Subject: [PATCH 22/72] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vdirsyncer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdirsyncer.spec b/vdirsyncer.spec index f1de95f..b994010 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -10,7 +10,7 @@ Name: vdirsyncer Version: 0.16.7 -Release: 2%{?git_tag}%{?dist} +Release: 3%{?git_tag}%{?dist} Summary: %{sum} License: BSD @@ -130,6 +130,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 0.16.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 03 2019 Fedora Release Engineering - 0.16.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From d5147a57e974cb8ce7b11987514c75916c94ed5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 19 Aug 2019 11:08:59 +0200 Subject: [PATCH 23/72] Rebuilt for Python 3.8 --- vdirsyncer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdirsyncer.spec b/vdirsyncer.spec index b994010..b120f1a 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -10,7 +10,7 @@ Name: vdirsyncer Version: 0.16.7 -Release: 3%{?git_tag}%{?dist} +Release: 4%{?git_tag}%{?dist} Summary: %{sum} License: BSD @@ -130,6 +130,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Mon Aug 19 2019 Miro Hrončok - 0.16.7-4 +- Rebuilt for Python 3.8 + * Sat Jul 27 2019 Fedora Release Engineering - 0.16.7-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 1eddde5ae940e1f784f59b6994af792b41f09445 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 19 Aug 2019 19:11:27 +0200 Subject: [PATCH 24/72] Rebuilt for Python 3.8 --- vdirsyncer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdirsyncer.spec b/vdirsyncer.spec index b120f1a..5753440 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -10,7 +10,7 @@ Name: vdirsyncer Version: 0.16.7 -Release: 4%{?git_tag}%{?dist} +Release: 5%{?git_tag}%{?dist} Summary: %{sum} License: BSD @@ -130,6 +130,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Mon Aug 19 2019 Miro Hrončok - 0.16.7-5 +- Rebuilt for Python 3.8 + * Mon Aug 19 2019 Miro Hrončok - 0.16.7-4 - Rebuilt for Python 3.8 From cbd74eeec518d23d2efdd02ef1dd3351090477ba Mon Sep 17 00:00:00 2001 From: David Kaufmann Date: Fri, 15 Nov 2019 04:56:58 +0100 Subject: [PATCH 25/72] Inject version string for setuptools_scm, as it builds from tarball, not git --- vdirsyncer.spec | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/vdirsyncer.spec b/vdirsyncer.spec index 5753440..ec73849 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -10,12 +10,12 @@ Name: vdirsyncer Version: 0.16.7 -Release: 5%{?git_tag}%{?dist} +Release: 6%{?git_tag}%{?dist} Summary: %{sum} License: BSD -URL: https://github.com/untitaker/%{name} -Source0: %pypi_source +URL: https://github.com/pimutils/%{name} +Source0: %{pypi_source} BuildArch: noarch Obsoletes: python2-%{srcname} <= 0.12.1 @@ -87,6 +87,12 @@ for the vdirsyncer calendar/address-book synchronization utility. %setup -q %build +# Here we set upstream version based on setuptools_scm documentation +# this is done to avoid the following error: +# LookupError: setuptools-scm was unable to detect version +# since we are not importing a .git repository in the tarball +# From: https://athoscr.fedorapeople.org/packaging/python-setuptools_scm_git_archive.spec +export SETUPTOOLS_SCM_PRETEND_VERSION=%{version} %py3_build # Custom sphinx docs need to import vdirsyncer classes from the untarred @@ -104,6 +110,12 @@ rm -fv docs/_build/html/{.buildinfo,objects.inv} %install +# Here we set upstream version based on setuptools_scm documentation +# this is done to avoid the following error: +# LookupError: setuptools-scm was unable to detect version +# since we are not importing a .git repository in the tarball +# From: https://athoscr.fedorapeople.org/packaging/python-setuptools_scm_git_archive.spec +export SETUPTOOLS_SCM_PRETEND_VERSION=%{version} %py3_install install -d "$RPM_BUILD_ROOT%{_mandir}/man1" @@ -117,7 +129,9 @@ sh build.sh tests %files -n python3-%{srcname} %license LICENSE %doc AUTHORS.rst README.rst CONTRIBUTING.rst -%{python3_sitelib}/* +%{python3_sitelib}/%{srcname}-*.egg-info +%{python3_sitelib}/%{srcname} + %files %license LICENSE @@ -130,6 +144,10 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Fri Nov 15 2019 David Kaufmann - 0.16.7-6 +- Fix url +- Inject version string for setuptools_scm, as it builds from tarball, not git + * Mon Aug 19 2019 Miro Hrončok - 0.16.7-5 - Rebuilt for Python 3.8 From c6f09ecc7522ffbcbbb1eb049cbcc8c1560118c5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 02:58:52 +0000 Subject: [PATCH 26/72] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vdirsyncer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdirsyncer.spec b/vdirsyncer.spec index ec73849..e0f9ea1 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -10,7 +10,7 @@ Name: vdirsyncer Version: 0.16.7 -Release: 6%{?git_tag}%{?dist} +Release: 7%{?git_tag}%{?dist} Summary: %{sum} License: BSD @@ -144,6 +144,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 0.16.7-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Nov 15 2019 David Kaufmann - 0.16.7-6 - Fix url - Inject version string for setuptools_scm, as it builds from tarball, not git From 127b7f0daaacd92b9ea3b59ae8cda3b79ecc5292 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 26 May 2020 03:54:19 +0200 Subject: [PATCH 27/72] Rebuilt for Python 3.9 --- vdirsyncer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdirsyncer.spec b/vdirsyncer.spec index e0f9ea1..93d8d61 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -10,7 +10,7 @@ Name: vdirsyncer Version: 0.16.7 -Release: 7%{?git_tag}%{?dist} +Release: 8%{?git_tag}%{?dist} Summary: %{sum} License: BSD @@ -144,6 +144,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Tue May 26 2020 Miro Hrončok - 0.16.7-8 +- Rebuilt for Python 3.9 + * Fri Jan 31 2020 Fedora Release Engineering - 0.16.7-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 8bec7e0c2cacb042fca5b4de807eba5f2fa2036d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 13:34:55 +0000 Subject: [PATCH 28/72] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vdirsyncer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdirsyncer.spec b/vdirsyncer.spec index 93d8d61..52384c1 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -10,7 +10,7 @@ Name: vdirsyncer Version: 0.16.7 -Release: 8%{?git_tag}%{?dist} +Release: 9%{?git_tag}%{?dist} Summary: %{sum} License: BSD @@ -144,6 +144,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 0.16.7-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue May 26 2020 Miro Hrončok - 0.16.7-8 - Rebuilt for Python 3.9 From bed81935302950ebaadd6420952a9e24ec367b30 Mon Sep 17 00:00:00 2001 From: David Kaufmann Date: Thu, 13 Aug 2020 22:19:01 +0200 Subject: [PATCH 29/72] update to v0.16.8 --- .gitignore | 1 + sources | 2 +- vdirsyncer.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index bf0152c..604f295 100644 --- a/.gitignore +++ b/.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 diff --git a/sources b/sources index ed27b19..f2793c9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdirsyncer-0.16.7.tar.gz) = 218c6781139a9e979077308dc732756cc27ecb67966e4b52be31cb1ebf04d224443036102d5c4bad253b9dcf533939f0b72082166f0fe94e042a7e946b8fad0e +SHA512 (vdirsyncer-0.16.8.tar.gz) = 12cb50f592085af37bd9c4207c0d31fdd38fc2a44712eb6288b12e7e7ee9af82070d1d405fa9579e935e545e6c92aafb6f8334ebde4976c4eb9412e78e7c5ada diff --git a/vdirsyncer.spec b/vdirsyncer.spec index 52384c1..e7b8676 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -9,8 +9,8 @@ %global _docdir_fmt %{name} Name: vdirsyncer -Version: 0.16.7 -Release: 9%{?git_tag}%{?dist} +Version: 0.16.8 +Release: 1%{?dist} Summary: %{sum} License: BSD @@ -144,6 +144,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Thu Aug 13 2020 David Kaufmann - 0.16.8-1 +- Update to v0.16.8 + * Wed Jul 29 2020 Fedora Release Engineering - 0.16.7-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 933cdfbd55682619e4e8729005dfa226ee6c3e36 Mon Sep 17 00:00:00 2001 From: David Kaufmann Date: Fri, 21 Aug 2020 20:55:33 +0200 Subject: [PATCH 30/72] add newer click compatibility patch --- vdirsyncer-0.16.8-click_compatibility.patch | 35 +++++++++++++++++++++ vdirsyncer.spec | 8 +++-- 2 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 vdirsyncer-0.16.8-click_compatibility.patch diff --git a/vdirsyncer-0.16.8-click_compatibility.patch b/vdirsyncer-0.16.8-click_compatibility.patch new file mode 100644 index 0000000..c0ee62f --- /dev/null +++ b/vdirsyncer-0.16.8-click_compatibility.patch @@ -0,0 +1,35 @@ +commit 3eb9ce5ae4320d52e6c876874511ff96a8a45f51 +Author: Hugo Osvaldo Barrera +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.spec b/vdirsyncer.spec index e7b8676..25e311b 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -10,12 +10,13 @@ Name: vdirsyncer Version: 0.16.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: %{sum} License: BSD URL: https://github.com/pimutils/%{name} Source0: %{pypi_source} +Patch0: vdirsyncer-0.16.8-click_compatibility.patch BuildArch: noarch Obsoletes: python2-%{srcname} <= 0.12.1 @@ -41,7 +42,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 +65,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 +86,7 @@ for the vdirsyncer calendar/address-book synchronization utility. %prep %setup -q +%patch -p1 %build # Here we set upstream version based on setuptools_scm documentation From dd30cdde3e05c7fe84ef54f0733056f7d9656dde Mon Sep 17 00:00:00 2001 From: David Kaufmann Date: Sat, 31 Oct 2020 14:07:13 +0100 Subject: [PATCH 31/72] Fix for python 3.9 deprecation of getiterator --- ....16.8-python_getiterator_deprecation.patch | 22 +++++++++++++++++++ vdirsyncer.spec | 6 ++++- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 vdirsyncer-0.16.8-python_getiterator_deprecation.patch diff --git a/vdirsyncer-0.16.8-python_getiterator_deprecation.patch b/vdirsyncer-0.16.8-python_getiterator_deprecation.patch new file mode 100644 index 0000000..bdcb7f2 --- /dev/null +++ b/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 +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 25e311b..75b60a1 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -10,13 +10,14 @@ Name: vdirsyncer Version: 0.16.8 -Release: 2%{?dist} +Release: 3%{?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 @@ -146,6 +147,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Sat Oct 31 2020 David Kaufmann - 0.16.8-3 +- Fix for python 3.9 deprecation of getiterator + * Thu Aug 13 2020 David Kaufmann - 0.16.8-1 - Update to v0.16.8 From e8732637b4b2132c9eab616d3cf00375ff41b9c9 Mon Sep 17 00:00:00 2001 From: David Kaufmann Date: Sun, 1 Nov 2020 05:55:26 +0100 Subject: [PATCH 32/72] fix %patch line --- vdirsyncer.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/vdirsyncer.spec b/vdirsyncer.spec index 75b60a1..5888c25 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -10,7 +10,7 @@ Name: vdirsyncer Version: 0.16.8 -Release: 3%{?dist} +Release: 4%{?dist} Summary: %{sum} License: BSD @@ -87,7 +87,8 @@ for the vdirsyncer calendar/address-book synchronization utility. %prep %setup -q -%patch -p1 +%patch0 -p1 +%patch1 -p1 %build # Here we set upstream version based on setuptools_scm documentation @@ -147,6 +148,12 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Sun Nov 01 2020 David Kaufmann - 0.16.8-4 +- Fix patch, as only Patch0 gets applied by default + +* Sat Oct 31 2020 David Kaufmann - 0.16.8-3 +- Fix for python 3.9 deprecation of getiterator + * Sat Oct 31 2020 David Kaufmann - 0.16.8-3 - Fix for python 3.9 deprecation of getiterator From 7899c0ed1f4b2c26a2b8f74f19baa14c9f10c915 Mon Sep 17 00:00:00 2001 From: David Kaufmann Date: Sun, 1 Nov 2020 05:58:43 +0100 Subject: [PATCH 33/72] fix duplicate changelog line --- vdirsyncer.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/vdirsyncer.spec b/vdirsyncer.spec index 5888c25..e0d0036 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -154,9 +154,6 @@ sh build.sh tests * Sat Oct 31 2020 David Kaufmann - 0.16.8-3 - Fix for python 3.9 deprecation of getiterator -* Sat Oct 31 2020 David Kaufmann - 0.16.8-3 -- Fix for python 3.9 deprecation of getiterator - * Thu Aug 13 2020 David Kaufmann - 0.16.8-1 - Update to v0.16.8 From a7509d07d1c368b3364bf8f8b0975476dc0c624b Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 9 Jan 2021 00:36:02 +0000 Subject: [PATCH 34/72] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- vdirsyncer.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/vdirsyncer.spec b/vdirsyncer.spec index e0d0036..88cda15 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -22,6 +22,7 @@ Patch1: vdirsyncer-0.16.8-python_getiterator_deprecation.patch BuildArch: noarch Obsoletes: python2-%{srcname} <= 0.12.1 +BuildRequires: make BuildRequires: python3-atomicwrites >= 0.1.7 BuildRequires: python3-click >= 5.0 BuildRequires: python3-click-log >= 0.3 From 1c6deb0d13bc1465d75e0752f479860168a7b310 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 22:56:26 +0000 Subject: [PATCH 35/72] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vdirsyncer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdirsyncer.spec b/vdirsyncer.spec index 88cda15..3431034 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -10,7 +10,7 @@ Name: vdirsyncer Version: 0.16.8 -Release: 4%{?dist} +Release: 5%{?dist} Summary: %{sum} License: BSD @@ -149,6 +149,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 0.16.8-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Sun Nov 01 2020 David Kaufmann - 0.16.8-4 - Fix patch, as only Patch0 gets applied by default From 120ce08f2d81eb9db855c14cbbd9d704a663faa0 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 4 Jun 2021 21:19:12 +0200 Subject: [PATCH 36/72] Rebuilt for Python 3.10 --- vdirsyncer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdirsyncer.spec b/vdirsyncer.spec index 3431034..40be403 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -10,7 +10,7 @@ Name: vdirsyncer Version: 0.16.8 -Release: 5%{?dist} +Release: 6%{?dist} Summary: %{sum} License: BSD @@ -149,6 +149,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Fri Jun 04 2021 Python Maint - 0.16.8-6 +- Rebuilt for Python 3.10 + * Wed Jan 27 2021 Fedora Release Engineering - 0.16.8-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From feebab95a08fd053c6bc430fb0fd7b2871d806ef Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 27 Jul 2021 09:25:51 +0000 Subject: [PATCH 37/72] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vdirsyncer.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/vdirsyncer.spec b/vdirsyncer.spec index 40be403..10846fe 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -10,7 +10,7 @@ Name: vdirsyncer Version: 0.16.8 -Release: 6%{?dist} +Release: 7%{?dist} Summary: %{sum} License: BSD @@ -149,6 +149,10 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Tue Jul 27 2021 Fedora Release Engineering - 0.16.8-7 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Fri Jun 04 2021 Python Maint - 0.16.8-6 - Rebuilt for Python 3.10 From a85172988bae7999867d034682d1947b99da15e9 Mon Sep 17 00:00:00 2001 From: David Kaufmann Date: Thu, 11 Nov 2021 01:52:04 +0100 Subject: [PATCH 38/72] 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 -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 -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 - 0.18.0-1 +- Update to v0.18.0 + * Tue Jul 27 2021 Fedora Release Engineering - 0.16.8-7 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From aef07a35630e24727bf44e9ef47ace8045035a02 Mon Sep 17 00:00:00 2001 From: David Kaufmann Date: Thu, 11 Nov 2021 01:55:59 +0100 Subject: [PATCH 39/72] 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 From cd05e60d009ba982aaa9c297f86aaca0fecd4cc9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 03:49:55 +0000 Subject: [PATCH 40/72] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vdirsyncer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdirsyncer.spec b/vdirsyncer.spec index 40d929f..f25eb31 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -10,7 +10,7 @@ Name: vdirsyncer Version: 0.18.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: %{sum} License: BSD @@ -145,6 +145,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 0.18.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Nov 11 2021 David Kaufmann - 0.18.0-1 - Update to v0.18.0 From f1aa35fd70034989e08c1d2dac9a152ed15b94f9 Mon Sep 17 00:00:00 2001 From: David Kaufmann Date: Fri, 18 Mar 2022 21:33:07 +0100 Subject: [PATCH 41/72] update dependency --- vdirsyncer.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vdirsyncer.spec b/vdirsyncer.spec index f25eb31..03d05b3 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -10,7 +10,7 @@ Name: vdirsyncer Version: 0.18.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: %{sum} License: BSD @@ -23,7 +23,7 @@ Obsoletes: python2-%{srcname} <= 0.12.1 BuildRequires: make BuildRequires: python3-atomicwrites >= 0.1.7 BuildRequires: python3-click >= 5.0 -BuildRequires: python3-click-log >= 0.3 +BuildRequires: python3-click-log >= 0.4 BuildRequires: python3-click-threading >= 0.4.0 BuildRequires: python3-devel BuildRequires: python3-icalendar @@ -145,6 +145,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Fri Mar 18 2022 David Kaufmann - 0.18.0-3 +- Update click-log dependency + * Sat Jan 22 2022 Fedora Release Engineering - 0.18.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 812b4eb878cc4cdd2ce8db4ca46426757598874c Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 15 Jun 2022 15:23:55 +0200 Subject: [PATCH 42/72] Rebuilt for Python 3.11 --- vdirsyncer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdirsyncer.spec b/vdirsyncer.spec index 03d05b3..bb18499 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -10,7 +10,7 @@ Name: vdirsyncer Version: 0.18.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: %{sum} License: BSD @@ -145,6 +145,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Wed Jun 15 2022 Python Maint - 0.18.0-4 +- Rebuilt for Python 3.11 + * Fri Mar 18 2022 David Kaufmann - 0.18.0-3 - Update click-log dependency From af08e1c804ed272e33f4c7b56b6f1bafb9025aa3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 11:43:41 +0000 Subject: [PATCH 43/72] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vdirsyncer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdirsyncer.spec b/vdirsyncer.spec index bb18499..cb7acb5 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -10,7 +10,7 @@ Name: vdirsyncer Version: 0.18.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: %{sum} License: BSD @@ -145,6 +145,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 0.18.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Jun 15 2022 Python Maint - 0.18.0-4 - Rebuilt for Python 3.11 From f8b9d53993d688e849006e3c78b20831e78ebf3c Mon Sep 17 00:00:00 2001 From: David Kaufmann Date: Mon, 15 Aug 2022 04:03:14 +0200 Subject: [PATCH 44/72] update dependencies at all locations --- vdirsyncer.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/vdirsyncer.spec b/vdirsyncer.spec index cb7acb5..a713111 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -10,7 +10,7 @@ Name: vdirsyncer Version: 0.18.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: %{sum} License: BSD @@ -38,7 +38,7 @@ BuildRequires: python3-sphinx_rtd_theme Requires: python3-atomicwrites >= 0.1.7 Requires: python3-click >= 5.0 -Requires: python3-click-log >= 0.3 +Requires: python3-click-log >= 0.4 Requires: python3-click-threading >= 0.4.0 Requires: python3-icalendar Requires: python3-lxml >= 3.1 @@ -61,7 +61,7 @@ Summary: %{sum} Requires: python3-atomicwrites >= 0.1.7 Requires: python3-click >= 5.0 -Requires: python3-click-log >= 0.3 +Requires: python3-click-log >= 0.4 Requires: python3-click-threading >= 0.4.0 Requires: python3-icalendar Requires: python3-lxml >= 3.1 @@ -145,6 +145,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Mon Aug 15 2022 David Kaufmann - 0.18.0-6 +- Update click-log dependency in all places + * Sat Jul 23 2022 Fedora Release Engineering - 0.18.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 10e8118755ca55ebcc5e7c90ce86e48f39d61d0b Mon Sep 17 00:00:00 2001 From: David Kaufmann Date: Wed, 17 Aug 2022 19:11:42 +0200 Subject: [PATCH 45/72] fix autogenerated dependency --- vdirsyncer-click-log-dependency-version.patch | 12 ++++++++++++ vdirsyncer.spec | 8 ++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 vdirsyncer-click-log-dependency-version.patch diff --git a/vdirsyncer-click-log-dependency-version.patch b/vdirsyncer-click-log-dependency-version.patch new file mode 100644 index 0000000..965093d --- /dev/null +++ b/vdirsyncer-click-log-dependency-version.patch @@ -0,0 +1,12 @@ +--- a/setup.py ++++ b/setup.py +@@ -12,7 +12,7 @@ + requirements = [ + # https://github.com/mitsuhiko/click/issues/200 + "click>=5.0,<9.0", +- "click-log>=0.3.0, <0.4.0", ++ "click-log>=0.3.0, <0.5.0", + # https://github.com/pimutils/vdirsyncer/issues/478 + "click-threading>=0.5", + "requests >=2.20.0", + diff --git a/vdirsyncer.spec b/vdirsyncer.spec index a713111..356ea0d 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -10,12 +10,13 @@ Name: vdirsyncer Version: 0.18.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: %{sum} License: BSD URL: https://github.com/pimutils/%{name} Source0: %{pypi_source} +Patch0: vdirsyncer-click-log-dependency-version.patch BuildArch: noarch Obsoletes: python2-%{srcname} <= 0.12.1 @@ -85,7 +86,7 @@ The vdirsyncer-doc package provides all the documentation for the vdirsyncer calendar/address-book synchronization utility. %prep -%setup -q +%autosetup -p1 %build # Here we set upstream version based on setuptools_scm documentation @@ -145,6 +146,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Wed Aug 17 2022 David Kaufmann - 0.18.0-7 +- Fix autogenerated dependency + * Mon Aug 15 2022 David Kaufmann - 0.18.0-6 - Update click-log dependency in all places From c14fa17a527c70d42e5b0dd1512752403da2383b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 06:08:53 +0000 Subject: [PATCH 46/72] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vdirsyncer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdirsyncer.spec b/vdirsyncer.spec index 356ea0d..af79093 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -10,7 +10,7 @@ Name: vdirsyncer Version: 0.18.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: %{sum} License: BSD @@ -146,6 +146,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 0.18.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Aug 17 2022 David Kaufmann - 0.18.0-7 - Fix autogenerated dependency From 8787f05bd02c4b5deabf16131ea565f6c331fb9b Mon Sep 17 00:00:00 2001 From: Python Maint Date: Thu, 15 Jun 2023 12:07:27 +0200 Subject: [PATCH 47/72] Rebuilt for Python 3.12 --- vdirsyncer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdirsyncer.spec b/vdirsyncer.spec index af79093..733175a 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -10,7 +10,7 @@ Name: vdirsyncer Version: 0.18.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: %{sum} License: BSD @@ -146,6 +146,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Thu Jun 15 2023 Python Maint - 0.18.0-9 +- Rebuilt for Python 3.12 + * Sat Jan 21 2023 Fedora Release Engineering - 0.18.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 6f9ea41c92064ef378589a796a0adfb2faba0807 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 17:27:54 +0000 Subject: [PATCH 48/72] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vdirsyncer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdirsyncer.spec b/vdirsyncer.spec index 733175a..d38bf81 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -10,7 +10,7 @@ Name: vdirsyncer Version: 0.18.0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: %{sum} License: BSD @@ -146,6 +146,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 0.18.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jun 15 2023 Python Maint - 0.18.0-9 - Rebuilt for Python 3.12 From eaeec6512f6bf1043c420e2c0b1889b75a9ae580 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 07:34:24 +0000 Subject: [PATCH 49/72] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- vdirsyncer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdirsyncer.spec b/vdirsyncer.spec index d38bf81..8c86236 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -10,7 +10,7 @@ Name: vdirsyncer Version: 0.18.0 -Release: 10%{?dist} +Release: 11%{?dist} Summary: %{sum} License: BSD @@ -146,6 +146,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 0.18.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 0.18.0-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 84a3ebd404087cd2b4467fded816e644812ee3c8 Mon Sep 17 00:00:00 2001 From: David Kaufmann Date: Sat, 3 Feb 2024 04:11:41 +0100 Subject: [PATCH 50/72] updated version --- vdirsyncer-click-log-dependency-version.patch | 12 ------------ vdirsyncer.spec | 17 +++++++++++------ 2 files changed, 11 insertions(+), 18 deletions(-) delete mode 100644 vdirsyncer-click-log-dependency-version.patch diff --git a/vdirsyncer-click-log-dependency-version.patch b/vdirsyncer-click-log-dependency-version.patch deleted file mode 100644 index 965093d..0000000 --- a/vdirsyncer-click-log-dependency-version.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/setup.py -+++ b/setup.py -@@ -12,7 +12,7 @@ - requirements = [ - # https://github.com/mitsuhiko/click/issues/200 - "click>=5.0,<9.0", -- "click-log>=0.3.0, <0.4.0", -+ "click-log>=0.3.0, <0.5.0", - # https://github.com/pimutils/vdirsyncer/issues/478 - "click-threading>=0.5", - "requests >=2.20.0", - diff --git a/vdirsyncer.spec b/vdirsyncer.spec index 8c86236..dfe733e 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -9,14 +9,13 @@ %global _docdir_fmt %{name} Name: vdirsyncer -Version: 0.18.0 -Release: 11%{?dist} +Version: 0.19.2 +Release: 1%{?dist} Summary: %{sum} License: BSD URL: https://github.com/pimutils/%{name} Source0: %{pypi_source} -Patch0: vdirsyncer-click-log-dependency-version.patch BuildArch: noarch Obsoletes: python2-%{srcname} <= 0.12.1 @@ -30,12 +29,15 @@ BuildRequires: python3-devel BuildRequires: python3-icalendar BuildRequires: python3-lxml BuildRequires: python3-requests >= 2.10 -BuildRequires: python3-requests-oauthlib BuildRequires: python3-requests-toolbelt >= 0.4.0 BuildRequires: python3-setuptools BuildRequires: python3-setuptools_scm BuildRequires: python3-sphinx BuildRequires: python3-sphinx_rtd_theme +BuildRequires: python3-aiohttp-oauthlib +BuildRequires: python3-trustme +BuildRequires: python3-pytest-httpserver +BuildRequires: python3-pytest-localserver Requires: python3-atomicwrites >= 0.1.7 Requires: python3-click >= 5.0 @@ -44,8 +46,8 @@ Requires: python3-click-threading >= 0.4.0 Requires: python3-icalendar Requires: python3-lxml >= 3.1 Requires: python3-requests >= 2.10 -Requires: python3-requests-oauthlib Requires: python3-requests-toolbelt >= 0.4.0 +Requires: python3-aiohttp-oauthlib Requires: python3-vdirsyncer = %{version} Requires: sqlite @@ -67,8 +69,8 @@ Requires: python3-click-threading >= 0.4.0 Requires: python3-icalendar Requires: python3-lxml >= 3.1 Requires: python3-requests >= 2.10 -Requires: python3-requests-oauthlib Requires: python3-requests-toolbelt >= 0.4.0 +Requires: python3-aiohttp-oauthlib %description -n python3-%{srcname} vdirsyncer synchronizes your calendars and address books between two entities. @@ -146,6 +148,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Sat Feb 03 2024 David Kaufmann - 0.19.2-1 +- Update to v0.19.2 + * Sat Jan 27 2024 Fedora Release Engineering - 0.18.0-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 122b9c44456ca0c4e2a6b1aac1c5c031786d014e Mon Sep 17 00:00:00 2001 From: David Kaufmann Date: Sun, 4 Feb 2024 00:56:59 +0100 Subject: [PATCH 51/72] and add sources --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 74fbcff..4deca4d 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /vdirsyncer-0.16.7.tar.gz /vdirsyncer-0.16.8.tar.gz /vdirsyncer-0.18.0.tar.gz +/vdirsyncer-0.19.2.tar.gz diff --git a/sources b/sources index 271e235..cbc9e85 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdirsyncer-0.18.0.tar.gz) = 0daefdc57f5562a7cdddba014fdeae9f1e68ec08568753073040dfc52e1740662b367df35a8f45e31d0672df5717b257fc0293eb4bd4c9bb10bad7cc79b12556 +SHA512 (vdirsyncer-0.19.2.tar.gz) = 056c58011d0a054a8cc215e9eabc706dfffb7d38deab5ae47311565b3bdb6de7a4772e97a0a50cdce33c82b09d559f1ec9cf9c84746553badf1d25791c7e08ce From b4d39fa52afe665deef152a5e283ff558e0204a9 Mon Sep 17 00:00:00 2001 From: David Kaufmann Date: Fri, 1 Mar 2024 23:54:04 +0100 Subject: [PATCH 52/72] fix version from github PR: Bump constraint for aiostream #1112 --- aiostream-version-bump.patch | 11 +++++++++++ vdirsyncer.spec | 4 +++- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 aiostream-version-bump.patch diff --git a/aiostream-version-bump.patch b/aiostream-version-bump.patch new file mode 100644 index 0000000..1fb3798 --- /dev/null +++ b/aiostream-version-bump.patch @@ -0,0 +1,11 @@ +--- a/setup.py 2024-02-06 23:47:09.556664674 +0100 ++++ b/setup.py 2024-02-06 23:47:24.707810178 +0100 +@@ -19,7 +19,7 @@ + # https://github.com/untitaker/python-atomicwrites/commit/4d12f23227b6a944ab1d99c507a69fdbc7c9ed6d # noqa + "atomicwrites>=0.1.7", + "aiohttp>=3.8.0,<4.0.0", +- "aiostream>=0.4.3,<0.5.0", ++ "aiostream>=0.4.3,<0.6.0", + ] + + diff --git a/vdirsyncer.spec b/vdirsyncer.spec index dfe733e..cf640e8 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -10,13 +10,15 @@ Name: vdirsyncer Version: 0.19.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: %{sum} License: BSD URL: https://github.com/pimutils/%{name} Source0: %{pypi_source} +Patch0: aiostream-version-bump.patch + BuildArch: noarch Obsoletes: python2-%{srcname} <= 0.12.1 From 3e4fba79b2557a1bb101c86d4a91ff312fe1153a Mon Sep 17 00:00:00 2001 From: Python Maint Date: Sun, 9 Jun 2024 11:39:20 +0200 Subject: [PATCH 53/72] Rebuilt for Python 3.13 --- vdirsyncer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdirsyncer.spec b/vdirsyncer.spec index cf640e8..89652a4 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -10,7 +10,7 @@ Name: vdirsyncer Version: 0.19.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: %{sum} License: BSD @@ -150,6 +150,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Sun Jun 09 2024 Python Maint - 0.19.2-3 +- Rebuilt for Python 3.13 + * Sat Feb 03 2024 David Kaufmann - 0.19.2-1 - Update to v0.19.2 From 0ec040f4f684b7f7871d04fefe9bbd694792d0d8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 08:37:04 +0000 Subject: [PATCH 54/72] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- vdirsyncer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdirsyncer.spec b/vdirsyncer.spec index 89652a4..da4d000 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -10,7 +10,7 @@ Name: vdirsyncer Version: 0.19.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: %{sum} License: BSD @@ -150,6 +150,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 0.19.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sun Jun 09 2024 Python Maint - 0.19.2-3 - Rebuilt for Python 3.13 From f77b1c8e800ffcdc1ea37dc3dd81d979e1ee496f Mon Sep 17 00:00:00 2001 From: Michel Lind Date: Mon, 26 Aug 2024 22:35:24 -0500 Subject: [PATCH 55/72] Bump allowed version of aiostream again Fixes: RHBZ#2308075 Signed-off-by: Michel Lind --- aiostream-version-bump.patch | 8 ++++---- vdirsyncer.spec | 8 ++++++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/aiostream-version-bump.patch b/aiostream-version-bump.patch index 1fb3798..97a1e87 100644 --- a/aiostream-version-bump.patch +++ b/aiostream-version-bump.patch @@ -1,11 +1,11 @@ ---- a/setup.py 2024-02-06 23:47:09.556664674 +0100 -+++ b/setup.py 2024-02-06 23:47:24.707810178 +0100 -@@ -19,7 +19,7 @@ +--- a/setup.py ++++ b/setup.py +@@ -19,7 +19,7 @@ requirements = [ # https://github.com/untitaker/python-atomicwrites/commit/4d12f23227b6a944ab1d99c507a69fdbc7c9ed6d # noqa "atomicwrites>=0.1.7", "aiohttp>=3.8.0,<4.0.0", - "aiostream>=0.4.3,<0.5.0", -+ "aiostream>=0.4.3,<0.6.0", ++ "aiostream>=0.4.3,<0.7.0", ] diff --git a/vdirsyncer.spec b/vdirsyncer.spec index da4d000..62ea804 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -10,7 +10,7 @@ Name: vdirsyncer Version: 0.19.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: %{sum} License: BSD @@ -22,7 +22,7 @@ Patch0: aiostream-version-bump.patch BuildArch: noarch Obsoletes: python2-%{srcname} <= 0.12.1 -BuildRequires: make +BuildRequires: make BuildRequires: python3-atomicwrites >= 0.1.7 BuildRequires: python3-click >= 5.0 BuildRequires: python3-click-log >= 0.4 @@ -150,6 +150,10 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Mon Aug 26 2024 Michel Lind - 0.19.2-5 +- Bump allowed version of aiostream again +- Fixes: RHBZ#2308075 + * Sat Jul 20 2024 Fedora Release Engineering - 0.19.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From f592c241cfef9e15c8e32e32301ff216fa920da1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 4 Sep 2024 22:37:49 +0200 Subject: [PATCH 56/72] convert license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- vdirsyncer.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/vdirsyncer.spec b/vdirsyncer.spec index 62ea804..6d61fb6 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -10,10 +10,11 @@ Name: vdirsyncer Version: 0.19.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: %{sum} -License: BSD +# Automatically converted from old format: BSD - review is highly recommended. +License: LicenseRef-Callaway-BSD URL: https://github.com/pimutils/%{name} Source0: %{pypi_source} @@ -150,6 +151,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Wed Sep 04 2024 Miroslav Suchý - 0.19.2-6 +- convert license to SPDX + * Mon Aug 26 2024 Michel Lind - 0.19.2-5 - Bump allowed version of aiostream again - Fixes: RHBZ#2308075 From 16805cd0d442242b42a2e36a429c381045ad3a2d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 14:09:46 +0000 Subject: [PATCH 57/72] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- vdirsyncer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdirsyncer.spec b/vdirsyncer.spec index 6d61fb6..deb3dc4 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -10,7 +10,7 @@ Name: vdirsyncer Version: 0.19.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: %{sum} # Automatically converted from old format: BSD - review is highly recommended. @@ -151,6 +151,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 0.19.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Sep 04 2024 Miroslav Suchý - 0.19.2-6 - convert license to SPDX From a87dcbdf53f45142b327a48569e15125875954f7 Mon Sep 17 00:00:00 2001 From: David Kaufmann Date: Wed, 21 May 2025 01:10:27 +0200 Subject: [PATCH 58/72] review licence, bump to v0.19.3 --- .gitignore | 1 + sources | 2 +- vdirsyncer.spec | 10 ++++++---- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 4deca4d..59e214c 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /vdirsyncer-0.16.8.tar.gz /vdirsyncer-0.18.0.tar.gz /vdirsyncer-0.19.2.tar.gz +/vdirsyncer-0.19.3.tar.gz diff --git a/sources b/sources index cbc9e85..dd8f01b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdirsyncer-0.19.2.tar.gz) = 056c58011d0a054a8cc215e9eabc706dfffb7d38deab5ae47311565b3bdb6de7a4772e97a0a50cdce33c82b09d559f1ec9cf9c84746553badf1d25791c7e08ce +SHA512 (vdirsyncer-0.19.3.tar.gz) = 8651282302ad62b2bb6f7655429492dcff959cedc25e932d2e72deb2bb54406c6b5333fecdb14ae8c08ba3c20602856e8466198e24caee298fc9a08545fd3751 diff --git a/vdirsyncer.spec b/vdirsyncer.spec index deb3dc4..336fdb1 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -9,12 +9,11 @@ %global _docdir_fmt %{name} Name: vdirsyncer -Version: 0.19.2 -Release: 7%{?dist} +Version: 0.19.3 +Release: 1%{?dist} Summary: %{sum} -# Automatically converted from old format: BSD - review is highly recommended. -License: LicenseRef-Callaway-BSD +License: BSD-3-Clause URL: https://github.com/pimutils/%{name} Source0: %{pypi_source} @@ -151,6 +150,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Wed May 21 2025 David Kaufmann - 0.19.3-1 +- Update to v0.19.3 + * Sun Jan 19 2025 Fedora Release Engineering - 0.19.2-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From ea96c3b1d2f150025fa3bfb8e4a25617d0219449 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 3 Jun 2025 20:36:53 +0200 Subject: [PATCH 59/72] Rebuilt for Python 3.14 --- vdirsyncer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdirsyncer.spec b/vdirsyncer.spec index 336fdb1..53f9b68 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -10,7 +10,7 @@ Name: vdirsyncer Version: 0.19.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: %{sum} License: BSD-3-Clause @@ -150,6 +150,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Tue Jun 03 2025 Python Maint - 0.19.3-2 +- Rebuilt for Python 3.14 + * Wed May 21 2025 David Kaufmann - 0.19.3-1 - Update to v0.19.3 From bc417a7321112e6f4f6cfbed6163802d3d915011 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Wed, 9 Jul 2025 20:50:15 -0400 Subject: [PATCH 60/72] Modernize RPM macros (rhbz#2378494) --- vdirsyncer.spec | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/vdirsyncer.spec b/vdirsyncer.spec index 53f9b68..df3decb 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -10,7 +10,7 @@ Name: vdirsyncer Version: 0.19.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: %{sum} License: BSD-3-Clause @@ -32,7 +32,6 @@ BuildRequires: python3-icalendar BuildRequires: python3-lxml BuildRequires: python3-requests >= 2.10 BuildRequires: python3-requests-toolbelt >= 0.4.0 -BuildRequires: python3-setuptools BuildRequires: python3-setuptools_scm BuildRequires: python3-sphinx BuildRequires: python3-sphinx_rtd_theme @@ -62,7 +61,6 @@ It aims to be for CalDAV and CardDAV what OfflineIMAP is for IMAP. %package -n python3-%{srcname} Summary: %{sum} -%{?python_provide:%python_provide python3-%{srcname}} Requires: python3-atomicwrites >= 0.1.7 Requires: python3-click >= 5.0 @@ -92,6 +90,9 @@ for the vdirsyncer calendar/address-book synchronization utility. %prep %autosetup -p1 +%generate_buildrequires +%pyproject_buildrequires + %build # Here we set upstream version based on setuptools_scm documentation # this is done to avoid the following error: @@ -99,7 +100,7 @@ for the vdirsyncer calendar/address-book synchronization utility. # since we are not importing a .git repository in the tarball # From: https://athoscr.fedorapeople.org/packaging/python-setuptools_scm_git_archive.spec export SETUPTOOLS_SCM_PRETEND_VERSION=%{version} -%py3_build +%pyproject_wheel # Custom sphinx docs need to import vdirsyncer classes from the untarred # source tree @@ -122,21 +123,21 @@ rm -fv docs/_build/html/{.buildinfo,objects.inv} # since we are not importing a .git repository in the tarball # From: https://athoscr.fedorapeople.org/packaging/python-setuptools_scm_git_archive.spec export SETUPTOOLS_SCM_PRETEND_VERSION=%{version} -%py3_install +%pyproject_install +%pyproject_save_files -l %{srcname} install -d "$RPM_BUILD_ROOT%{_mandir}/man1" cp -r docs/_build/man/%{name}.1 "$RPM_BUILD_ROOT%{_mandir}/man1" %check +%pyproject_check_import + %if %{with tests} sh build.sh tests %endif -%files -n python3-%{srcname} -%license LICENSE +%files -n python3-%{srcname} -f %{pyproject_files} %doc AUTHORS.rst README.rst CONTRIBUTING.rst -%{python3_sitelib}/%{srcname}-*.egg-info -%{python3_sitelib}/%{srcname} %files @@ -150,6 +151,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Wed Jul 09 2025 Ben Boeckel - 0.19.3-3 +- Modernize RPM macros (rhbz#2378494) + * Tue Jun 03 2025 Python Maint - 0.19.3-2 - Rebuilt for Python 3.14 From b13b1fa81906a3e8b17ac1d22b7bc3d22560400d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 19:59:40 +0000 Subject: [PATCH 61/72] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- vdirsyncer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdirsyncer.spec b/vdirsyncer.spec index df3decb..d1d0652 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -10,7 +10,7 @@ Name: vdirsyncer Version: 0.19.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: %{sum} License: BSD-3-Clause @@ -151,6 +151,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 0.19.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Wed Jul 09 2025 Ben Boeckel - 0.19.3-3 - Modernize RPM macros (rhbz#2378494) From e7abc5458e9faf865e17af423bfddf6650c85e45 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 15:21:54 +0200 Subject: [PATCH 62/72] Rebuilt for Python 3.14.0rc2 bytecode --- vdirsyncer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdirsyncer.spec b/vdirsyncer.spec index d1d0652..3055454 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -10,7 +10,7 @@ Name: vdirsyncer Version: 0.19.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: %{sum} License: BSD-3-Clause @@ -151,6 +151,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Fri Aug 15 2025 Python Maint - 0.19.3-5 +- Rebuilt for Python 3.14.0rc2 bytecode + * Fri Jul 25 2025 Fedora Release Engineering - 0.19.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From dc27ee49efa5a78fc1624a3a7a7e4764607f0854 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Mon, 18 Aug 2025 12:14:55 -0400 Subject: [PATCH 63/72] Remove atomicwrites dependency (see rhbz#2385436) --- remove-atomicwrites-dep.patch | 178 ++++++++++++++++++++++++++++++++++ vdirsyncer.spec | 9 +- 2 files changed, 183 insertions(+), 4 deletions(-) create mode 100644 remove-atomicwrites-dep.patch diff --git a/remove-atomicwrites-dep.patch b/remove-atomicwrites-dep.patch new file mode 100644 index 0000000..c42fd10 --- /dev/null +++ b/remove-atomicwrites-dep.patch @@ -0,0 +1,178 @@ +From 8b063c39cb3e26a2beef5b6beed7e99c9e9641ac Mon Sep 17 00:00:00 2001 +From: Ben Boeckel +Date: Thu, 13 Feb 2025 09:00:58 +0100 +Subject: [PATCH] atomicwrites: remove dependency on abandoned library + +--- + .builds/tests-archlinux.yml | 1 - + .pre-commit-config.yaml | 1 - + CHANGELOG.rst | 5 +++++ + setup.py | 2 -- + vdirsyncer/cli/utils.py | 2 +- + vdirsyncer/storage/filesystem.py | 3 +-- + vdirsyncer/storage/google.py | 2 +- + vdirsyncer/storage/singlefile.py | 3 +-- + vdirsyncer/utils.py | 26 ++++++++++++++++++++++++++ + 9 files changed, 35 insertions(+), 10 deletions(-) + +diff --git a/.builds/tests-archlinux.yml b/.builds/tests-archlinux.yml +index b11fe30d2..494f6c73c 100644 +--- a/.builds/tests-archlinux.yml ++++ b/.builds/tests-archlinux.yml +@@ -10,7 +10,6 @@ packages: + - python-installer + - python-setuptools-scm + # Runtime dependencies: +- - python-atomicwrites + - python-click + - python-click-log + - python-click-threading +diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml +index 7304056b9..6beb3a4ca 100644 +--- a/.pre-commit-config.yaml ++++ b/.pre-commit-config.yaml +@@ -21,7 +21,6 @@ repos: + - types-setuptools + - types-docutils + - types-requests +- - types-atomicwrites + - repo: https://github.com/charliermarsh/ruff-pre-commit + rev: 'v0.2.2' + hooks: +diff --git a/CHANGELOG.rst b/CHANGELOG.rst +index b43a33de9..bc32cfda0 100644 +--- a/CHANGELOG.rst ++++ b/CHANGELOG.rst +@@ -9,6 +9,11 @@ Package maintainers and users who have to manually update their installation + may want to subscribe to `GitHub's tag feed + `_. + ++Version 0.19.4 ++============== ++ ++- Remove dependency on abandoned ``atomicwrites`` library. ++ + Version 0.19.3 + ============== + +diff --git a/setup.py b/setup.py +index 47f45a4cc..30cdc9c3b 100644 +--- a/setup.py ++++ b/setup.py +@@ -16,8 +16,6 @@ + "click>=5.0,<9.0", + "click-log>=0.3.0, <0.5.0", + "requests >=2.20.0", +- # https://github.com/untitaker/python-atomicwrites/commit/4d12f23227b6a944ab1d99c507a69fdbc7c9ed6d # noqa +- "atomicwrites>=0.1.7", + "aiohttp>=3.8.2,<4.0.0", + "aiostream>=0.4.3,<0.5.0", + ] +diff --git a/vdirsyncer/cli/utils.py b/vdirsyncer/cli/utils.py +index 428a9c9a3..97f48edc2 100644 +--- a/vdirsyncer/cli/utils.py ++++ b/vdirsyncer/cli/utils.py +@@ -10,7 +10,6 @@ + + import aiohttp + import click +-from atomicwrites import atomic_write + + from .. import BUGTRACKER_HOME + from .. import DOCS_HOME +@@ -21,6 +20,7 @@ + from ..sync.exceptions import StorageEmpty + from ..sync.exceptions import SyncConflict + from ..sync.status import SqliteStatus ++from ..utils import atomic_write + from ..utils import expand_path + from ..utils import get_storage_init_args + from . import cli_logger +diff --git a/vdirsyncer/storage/filesystem.py b/vdirsyncer/storage/filesystem.py +index ec0ab52e3..8785acc30 100644 +--- a/vdirsyncer/storage/filesystem.py ++++ b/vdirsyncer/storage/filesystem.py +@@ -5,9 +5,8 @@ + import os + import subprocess + +-from atomicwrites import atomic_write +- + from .. import exceptions ++from ..utils import atomic_write + from ..utils import checkdir + from ..utils import expand_path + from ..utils import generate_href +diff --git a/vdirsyncer/storage/google.py b/vdirsyncer/storage/google.py +index 93b784872..ed496a06b 100644 +--- a/vdirsyncer/storage/google.py ++++ b/vdirsyncer/storage/google.py +@@ -11,9 +11,9 @@ + + import aiohttp + import click +-from atomicwrites import atomic_write + + from .. import exceptions ++from ..utils import atomic_write + from ..utils import checkdir + from ..utils import expand_path + from ..utils import open_graphical_browser +diff --git a/vdirsyncer/storage/singlefile.py b/vdirsyncer/storage/singlefile.py +index 982763295..41e7e330e 100644 +--- a/vdirsyncer/storage/singlefile.py ++++ b/vdirsyncer/storage/singlefile.py +@@ -8,9 +8,8 @@ + import os + from typing import Iterable + +-from atomicwrites import atomic_write +- + from .. import exceptions ++from ..utils import atomic_write + from ..utils import checkfile + from ..utils import expand_path + from ..utils import get_etag_from_file +diff --git a/vdirsyncer/utils.py b/vdirsyncer/utils.py +index 2e0fd9ce4..657d2d6a5 100644 +--- a/vdirsyncer/utils.py ++++ b/vdirsyncer/utils.py +@@ -1,8 +1,10 @@ + from __future__ import annotations + ++import contextlib + import functools + import os + import sys ++import tempfile + import uuid + from inspect import getfullargspec + from typing import Callable +@@ -220,3 +222,27 @@ def open_graphical_browser(url, new=0, autoraise=True): + return + + raise RuntimeError("No graphical browser found. Please open the URL " "manually.") ++ ++ ++@contextlib.contextmanager ++def atomic_write(dest, mode="wb", overwrite=False): ++ if "w" not in mode: ++ raise RuntimeError("`atomic_write` requires write access") ++ ++ fd, src = tempfile.mkstemp(prefix=os.path.basename(dest), dir=os.path.dirname(dest)) ++ file = os.fdopen(fd, mode=mode) ++ ++ try: ++ yield file ++ except Exception: ++ os.unlink(src) ++ raise ++ else: ++ file.flush() ++ file.close() ++ ++ if overwrite: ++ os.rename(src, dest) ++ else: ++ os.link(src, dest) ++ os.unlink(src) diff --git a/vdirsyncer.spec b/vdirsyncer.spec index 3055454..991616c 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -10,7 +10,7 @@ Name: vdirsyncer Version: 0.19.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: %{sum} License: BSD-3-Clause @@ -18,12 +18,12 @@ URL: https://github.com/pimutils/%{name} Source0: %{pypi_source} Patch0: aiostream-version-bump.patch +Patch1: remove-atomicwrites-dep.patch BuildArch: noarch Obsoletes: python2-%{srcname} <= 0.12.1 BuildRequires: make -BuildRequires: python3-atomicwrites >= 0.1.7 BuildRequires: python3-click >= 5.0 BuildRequires: python3-click-log >= 0.4 BuildRequires: python3-click-threading >= 0.4.0 @@ -40,7 +40,6 @@ BuildRequires: python3-trustme BuildRequires: python3-pytest-httpserver BuildRequires: python3-pytest-localserver -Requires: python3-atomicwrites >= 0.1.7 Requires: python3-click >= 5.0 Requires: python3-click-log >= 0.4 Requires: python3-click-threading >= 0.4.0 @@ -62,7 +61,6 @@ It aims to be for CalDAV and CardDAV what OfflineIMAP is for IMAP. %package -n python3-%{srcname} Summary: %{sum} -Requires: python3-atomicwrites >= 0.1.7 Requires: python3-click >= 5.0 Requires: python3-click-log >= 0.4 Requires: python3-click-threading >= 0.4.0 @@ -151,6 +149,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Mon Aug 18 2025 Ben Boeckel - 0.19.3-6 +- Remove atomicwrites dependency (see rhbz#2385436) + * Fri Aug 15 2025 Python Maint - 0.19.3-5 - Rebuilt for Python 3.14.0rc2 bytecode From ab2928be81fee48f512e5a1a43a68c68e44a6543 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Mon, 18 Aug 2025 12:42:28 -0400 Subject: [PATCH 64/72] atomicwrites: munge patch for backporting --- remove-atomicwrites-dep.patch | 19 +------------------ vdirsyncer.spec | 1 + 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/remove-atomicwrites-dep.patch b/remove-atomicwrites-dep.patch index c42fd10..d7d23d1 100644 --- a/remove-atomicwrites-dep.patch +++ b/remove-atomicwrites-dep.patch @@ -1,20 +1,3 @@ -From 8b063c39cb3e26a2beef5b6beed7e99c9e9641ac Mon Sep 17 00:00:00 2001 -From: Ben Boeckel -Date: Thu, 13 Feb 2025 09:00:58 +0100 -Subject: [PATCH] atomicwrites: remove dependency on abandoned library - ---- - .builds/tests-archlinux.yml | 1 - - .pre-commit-config.yaml | 1 - - CHANGELOG.rst | 5 +++++ - setup.py | 2 -- - vdirsyncer/cli/utils.py | 2 +- - vdirsyncer/storage/filesystem.py | 3 +-- - vdirsyncer/storage/google.py | 2 +- - vdirsyncer/storage/singlefile.py | 3 +-- - vdirsyncer/utils.py | 26 ++++++++++++++++++++++++++ - 9 files changed, 35 insertions(+), 10 deletions(-) - diff --git a/.builds/tests-archlinux.yml b/.builds/tests-archlinux.yml index b11fe30d2..494f6c73c 100644 --- a/.builds/tests-archlinux.yml @@ -65,7 +48,7 @@ index 47f45a4cc..30cdc9c3b 100644 "requests >=2.20.0", - # https://github.com/untitaker/python-atomicwrites/commit/4d12f23227b6a944ab1d99c507a69fdbc7c9ed6d # noqa - "atomicwrites>=0.1.7", - "aiohttp>=3.8.2,<4.0.0", + "aiohttp>=3.8.0,<4.0.0", "aiostream>=0.4.3,<0.5.0", ] diff --git a/vdirsyncer/cli/utils.py b/vdirsyncer/cli/utils.py diff --git a/vdirsyncer.spec b/vdirsyncer.spec index 991616c..c15f5e6 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -18,6 +18,7 @@ URL: https://github.com/pimutils/%{name} Source0: %{pypi_source} Patch0: aiostream-version-bump.patch +# https://github.com/pimutils/vdirsyncer/commit/8b063c39cb3e26a2beef5b6beed7e99c9e9641ac Patch1: remove-atomicwrites-dep.patch BuildArch: noarch From 07d8c8ea92369b77f5ae7dce84855142f4edab96 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Mon, 18 Aug 2025 13:45:41 -0400 Subject: [PATCH 65/72] atomicwrites: tweak context again --- remove-atomicwrites-dep.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/remove-atomicwrites-dep.patch b/remove-atomicwrites-dep.patch index d7d23d1..5a37153 100644 --- a/remove-atomicwrites-dep.patch +++ b/remove-atomicwrites-dep.patch @@ -49,7 +49,7 @@ index 47f45a4cc..30cdc9c3b 100644 - # https://github.com/untitaker/python-atomicwrites/commit/4d12f23227b6a944ab1d99c507a69fdbc7c9ed6d # noqa - "atomicwrites>=0.1.7", "aiohttp>=3.8.0,<4.0.0", - "aiostream>=0.4.3,<0.5.0", + "aiostream>=0.4.3,<0.7.0", ] diff --git a/vdirsyncer/cli/utils.py b/vdirsyncer/cli/utils.py index 428a9c9a3..97f48edc2 100644 From 7c091a3f8a7435964cbd2cfac045abf90f8da718 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Thu, 28 Aug 2025 21:19:25 -0400 Subject: [PATCH 66/72] Update to 0.20.0 --- .gitignore | 1 + aiostream-version-bump.patch | 11 --- remove-atomicwrites-dep.patch | 161 ---------------------------------- sources | 1 + vdirsyncer.spec | 11 ++- 5 files changed, 7 insertions(+), 178 deletions(-) delete mode 100644 aiostream-version-bump.patch delete mode 100644 remove-atomicwrites-dep.patch diff --git a/.gitignore b/.gitignore index 59e214c..131b402 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ /vdirsyncer-0.18.0.tar.gz /vdirsyncer-0.19.2.tar.gz /vdirsyncer-0.19.3.tar.gz +/vdirsyncer-0.20.0.tar.gz diff --git a/aiostream-version-bump.patch b/aiostream-version-bump.patch deleted file mode 100644 index 97a1e87..0000000 --- a/aiostream-version-bump.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/setup.py -+++ b/setup.py -@@ -19,7 +19,7 @@ requirements = [ - # https://github.com/untitaker/python-atomicwrites/commit/4d12f23227b6a944ab1d99c507a69fdbc7c9ed6d # noqa - "atomicwrites>=0.1.7", - "aiohttp>=3.8.0,<4.0.0", -- "aiostream>=0.4.3,<0.5.0", -+ "aiostream>=0.4.3,<0.7.0", - ] - - diff --git a/remove-atomicwrites-dep.patch b/remove-atomicwrites-dep.patch deleted file mode 100644 index 5a37153..0000000 --- a/remove-atomicwrites-dep.patch +++ /dev/null @@ -1,161 +0,0 @@ -diff --git a/.builds/tests-archlinux.yml b/.builds/tests-archlinux.yml -index b11fe30d2..494f6c73c 100644 ---- a/.builds/tests-archlinux.yml -+++ b/.builds/tests-archlinux.yml -@@ -10,7 +10,6 @@ packages: - - python-installer - - python-setuptools-scm - # Runtime dependencies: -- - python-atomicwrites - - python-click - - python-click-log - - python-click-threading -diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml -index 7304056b9..6beb3a4ca 100644 ---- a/.pre-commit-config.yaml -+++ b/.pre-commit-config.yaml -@@ -21,7 +21,6 @@ repos: - - types-setuptools - - types-docutils - - types-requests -- - types-atomicwrites - - repo: https://github.com/charliermarsh/ruff-pre-commit - rev: 'v0.2.2' - hooks: -diff --git a/CHANGELOG.rst b/CHANGELOG.rst -index b43a33de9..bc32cfda0 100644 ---- a/CHANGELOG.rst -+++ b/CHANGELOG.rst -@@ -9,6 +9,11 @@ Package maintainers and users who have to manually update their installation - may want to subscribe to `GitHub's tag feed - `_. - -+Version 0.19.4 -+============== -+ -+- Remove dependency on abandoned ``atomicwrites`` library. -+ - Version 0.19.3 - ============== - -diff --git a/setup.py b/setup.py -index 47f45a4cc..30cdc9c3b 100644 ---- a/setup.py -+++ b/setup.py -@@ -16,8 +16,6 @@ - "click>=5.0,<9.0", - "click-log>=0.3.0, <0.5.0", - "requests >=2.20.0", -- # https://github.com/untitaker/python-atomicwrites/commit/4d12f23227b6a944ab1d99c507a69fdbc7c9ed6d # noqa -- "atomicwrites>=0.1.7", - "aiohttp>=3.8.0,<4.0.0", - "aiostream>=0.4.3,<0.7.0", - ] -diff --git a/vdirsyncer/cli/utils.py b/vdirsyncer/cli/utils.py -index 428a9c9a3..97f48edc2 100644 ---- a/vdirsyncer/cli/utils.py -+++ b/vdirsyncer/cli/utils.py -@@ -10,7 +10,6 @@ - - import aiohttp - import click --from atomicwrites import atomic_write - - from .. import BUGTRACKER_HOME - from .. import DOCS_HOME -@@ -21,6 +20,7 @@ - from ..sync.exceptions import StorageEmpty - from ..sync.exceptions import SyncConflict - from ..sync.status import SqliteStatus -+from ..utils import atomic_write - from ..utils import expand_path - from ..utils import get_storage_init_args - from . import cli_logger -diff --git a/vdirsyncer/storage/filesystem.py b/vdirsyncer/storage/filesystem.py -index ec0ab52e3..8785acc30 100644 ---- a/vdirsyncer/storage/filesystem.py -+++ b/vdirsyncer/storage/filesystem.py -@@ -5,9 +5,8 @@ - import os - import subprocess - --from atomicwrites import atomic_write -- - from .. import exceptions -+from ..utils import atomic_write - from ..utils import checkdir - from ..utils import expand_path - from ..utils import generate_href -diff --git a/vdirsyncer/storage/google.py b/vdirsyncer/storage/google.py -index 93b784872..ed496a06b 100644 ---- a/vdirsyncer/storage/google.py -+++ b/vdirsyncer/storage/google.py -@@ -11,9 +11,9 @@ - - import aiohttp - import click --from atomicwrites import atomic_write - - from .. import exceptions -+from ..utils import atomic_write - from ..utils import checkdir - from ..utils import expand_path - from ..utils import open_graphical_browser -diff --git a/vdirsyncer/storage/singlefile.py b/vdirsyncer/storage/singlefile.py -index 982763295..41e7e330e 100644 ---- a/vdirsyncer/storage/singlefile.py -+++ b/vdirsyncer/storage/singlefile.py -@@ -8,9 +8,8 @@ - import os - from typing import Iterable - --from atomicwrites import atomic_write -- - from .. import exceptions -+from ..utils import atomic_write - from ..utils import checkfile - from ..utils import expand_path - from ..utils import get_etag_from_file -diff --git a/vdirsyncer/utils.py b/vdirsyncer/utils.py -index 2e0fd9ce4..657d2d6a5 100644 ---- a/vdirsyncer/utils.py -+++ b/vdirsyncer/utils.py -@@ -1,8 +1,10 @@ - from __future__ import annotations - -+import contextlib - import functools - import os - import sys -+import tempfile - import uuid - from inspect import getfullargspec - from typing import Callable -@@ -220,3 +222,27 @@ def open_graphical_browser(url, new=0, autoraise=True): - return - - raise RuntimeError("No graphical browser found. Please open the URL " "manually.") -+ -+ -+@contextlib.contextmanager -+def atomic_write(dest, mode="wb", overwrite=False): -+ if "w" not in mode: -+ raise RuntimeError("`atomic_write` requires write access") -+ -+ fd, src = tempfile.mkstemp(prefix=os.path.basename(dest), dir=os.path.dirname(dest)) -+ file = os.fdopen(fd, mode=mode) -+ -+ try: -+ yield file -+ except Exception: -+ os.unlink(src) -+ raise -+ else: -+ file.flush() -+ file.close() -+ -+ if overwrite: -+ os.rename(src, dest) -+ else: -+ os.link(src, dest) -+ os.unlink(src) diff --git a/sources b/sources index dd8f01b..c25ba16 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (vdirsyncer-0.19.3.tar.gz) = 8651282302ad62b2bb6f7655429492dcff959cedc25e932d2e72deb2bb54406c6b5333fecdb14ae8c08ba3c20602856e8466198e24caee298fc9a08545fd3751 +SHA512 (vdirsyncer-0.20.0.tar.gz) = 8499440ce8ba036d40f5bbff9d7cadb485be8bb2419d1fbad947f244259dabba9f2527ffff24298f697dd10e6ccd39155ea9547a480c584f64da0eadb993dad7 diff --git a/vdirsyncer.spec b/vdirsyncer.spec index c15f5e6..61a051e 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -9,18 +9,14 @@ %global _docdir_fmt %{name} Name: vdirsyncer -Version: 0.19.3 -Release: 6%{?dist} +Version: 0.20.0 +Release: 1%{?dist} Summary: %{sum} License: BSD-3-Clause URL: https://github.com/pimutils/%{name} Source0: %{pypi_source} -Patch0: aiostream-version-bump.patch -# https://github.com/pimutils/vdirsyncer/commit/8b063c39cb3e26a2beef5b6beed7e99c9e9641ac -Patch1: remove-atomicwrites-dep.patch - BuildArch: noarch Obsoletes: python2-%{srcname} <= 0.12.1 @@ -150,6 +146,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Thu Aug 28 2025 Ben Boeckel - 0.20.0-1 +- Update to 0.20.0 + * Mon Aug 18 2025 Ben Boeckel - 0.19.3-6 - Remove atomicwrites dependency (see rhbz#2385436) From 3cc425bd460a80e8ad02cc3774819cc714e1b98b Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 15:02:01 +0200 Subject: [PATCH 67/72] Rebuilt for Python 3.14.0rc3 bytecode --- vdirsyncer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdirsyncer.spec b/vdirsyncer.spec index 61a051e..23abe0d 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -10,7 +10,7 @@ Name: vdirsyncer Version: 0.20.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: %{sum} License: BSD-3-Clause @@ -146,6 +146,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Fri Sep 19 2025 Python Maint - 0.20.0-2 +- Rebuilt for Python 3.14.0rc3 bytecode + * Thu Aug 28 2025 Ben Boeckel - 0.20.0-1 - Update to 0.20.0 From accb86a950fc7b0f6d54f2c9f58b155d5e688ee3 Mon Sep 17 00:00:00 2001 From: Michel Lind Date: Tue, 16 Dec 2025 16:35:00 +0000 Subject: [PATCH 68/72] Support building with old setuptools (pre-PEP 639) Signed-off-by: Michel Lind --- series | 1 + ...syncer-revert-license-metadata-update.diff | 19 +++++++++++++++ vdirsyncer.spec | 23 ++++++++++++++++--- 3 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 series create mode 100644 vdirsyncer-revert-license-metadata-update.diff diff --git a/series b/series new file mode 100644 index 0000000..7526468 --- /dev/null +++ b/series @@ -0,0 +1 @@ +vdirsyncer-revert-license-metadata-update.diff diff --git a/vdirsyncer-revert-license-metadata-update.diff b/vdirsyncer-revert-license-metadata-update.diff new file mode 100644 index 0000000..919b5aa --- /dev/null +++ b/vdirsyncer-revert-license-metadata-update.diff @@ -0,0 +1,19 @@ +Reverting changes in 03d1c4666d701283ceba479174925963fa607f3b but with improvements + +See https://github.com/pimutils/vdirsyncer/pull/1204 for bumping the required setuptools to actually work with the new declarations +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -16,11 +16,11 @@ description = "Synchronize calendars and + readme = "README.rst" + requires-python = ">=3.8" + keywords = ["todo", "task", "icalendar", "cli"] +-license = "BSD-3-Clause" +-license-files = ["LICENSE"] ++license = {file = "LICENSE"} + classifiers = [ + "Development Status :: 4 - Beta", + "Environment :: Console", ++ "License :: OSI Approved :: BSD License", + "Operating System :: POSIX", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.10", diff --git a/vdirsyncer.spec b/vdirsyncer.spec index 23abe0d..6c31c00 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -2,6 +2,14 @@ # as we need to package both wsgi_intercept and pytest-localserver # for them to work. Will also need BR: pystest once the two # above packages exist in Fedora +%bcond tests 0 + +%if (%{defined fedora} && 0%{?fedora} <= 42) || (%{defined rhel} && 0%{?rhel} <= 10) +# setuptools < 77 does not support PEP 639 +%bcond old_setuptools 1 +%else +%bcond old_setuptools 0 +%endif %global sum Synchronize calendars and contacts %global srcname vdirsyncer @@ -10,12 +18,14 @@ Name: vdirsyncer Version: 0.20.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: %{sum} License: BSD-3-Clause URL: https://github.com/pimutils/%{name} -Source0: %{pypi_source} +Source: %{pypi_source} +# conditional patches +Patch1000: vdirsyncer-revert-license-metadata-update.diff BuildArch: noarch Obsoletes: python2-%{srcname} <= 0.12.1 @@ -83,7 +93,11 @@ The vdirsyncer-doc package provides all the documentation for the vdirsyncer calendar/address-book synchronization utility. %prep -%autosetup -p1 +%autosetup -N +%autopatch -p1 -M 999 +%if %{with old_setuptools} +%autopatch -p1 1000 +%endif %generate_buildrequires %pyproject_buildrequires @@ -146,6 +160,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Tue Dec 16 2025 Michel Lind - 0.20.0-3 +- Support building with old setuptools (pre-PEP 639) + * Fri Sep 19 2025 Python Maint - 0.20.0-2 - Rebuilt for Python 3.14.0rc3 bytecode From 5090882e1682915406f801963bd0e207e3153b77 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 19:48:58 +0000 Subject: [PATCH 69/72] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- vdirsyncer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdirsyncer.spec b/vdirsyncer.spec index 6c31c00..c95f009 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -18,7 +18,7 @@ Name: vdirsyncer Version: 0.20.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: %{sum} License: BSD-3-Clause @@ -160,6 +160,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 0.20.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Tue Dec 16 2025 Michel Lind - 0.20.0-3 - Support building with old setuptools (pre-PEP 639) From da001d76bcc47e2bc761151117a6d112cb27ef32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hrn=C4=8Diar?= Date: Mon, 4 May 2026 11:25:45 +0200 Subject: [PATCH 70/72] Add BuildRequires on python3-pkg-resources for setuptools 82 compatibility Setuptools 82 dropped pkg_resources from the setuptools distribution. Add explicit build dependency on the compat package. Assisted-by: Cursor --- vdirsyncer.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/vdirsyncer.spec b/vdirsyncer.spec index c95f009..97a0d57 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -18,7 +18,7 @@ Name: vdirsyncer Version: 0.20.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: %{sum} License: BSD-3-Clause @@ -46,6 +46,7 @@ BuildRequires: python3-aiohttp-oauthlib BuildRequires: python3-trustme BuildRequires: python3-pytest-httpserver BuildRequires: python3-pytest-localserver +BuildRequires: python3-pkg-resources Requires: python3-click >= 5.0 Requires: python3-click-log >= 0.4 @@ -160,6 +161,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Thu May 07 2026 Tomáš Hrnčiar - 0.20.0-5 +- Add BR on python3-pkg-resources, setuptools 82 dropped pkg_resources + * Sat Jan 17 2026 Fedora Release Engineering - 0.20.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 7db9d7666bd4ca001ab9ff4e884ff862078c02b3 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Thu, 4 Jun 2026 15:56:10 +0200 Subject: [PATCH 71/72] Rebuilt for Python 3.15 --- vdirsyncer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdirsyncer.spec b/vdirsyncer.spec index 97a0d57..14cea51 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -18,7 +18,7 @@ Name: vdirsyncer Version: 0.20.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: %{sum} License: BSD-3-Clause @@ -161,6 +161,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Thu Jun 04 2026 Python Maint - 0.20.0-6 +- Rebuilt for Python 3.15 + * Thu May 07 2026 Tomáš Hrnčiar - 0.20.0-5 - Add BR on python3-pkg-resources, setuptools 82 dropped pkg_resources From 195ab5d0cc7202f4287b4252f68a573c009f71de Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:23:42 +0000 Subject: [PATCH 72/72] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- vdirsyncer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdirsyncer.spec b/vdirsyncer.spec index 14cea51..4f7147d 100644 --- a/vdirsyncer.spec +++ b/vdirsyncer.spec @@ -18,7 +18,7 @@ Name: vdirsyncer Version: 0.20.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: %{sum} License: BSD-3-Clause @@ -161,6 +161,9 @@ sh build.sh tests %doc docs/_build/html docs/_build/text %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 0.20.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Thu Jun 04 2026 Python Maint - 0.20.0-6 - Rebuilt for Python 3.15