Compare commits

..

5 commits

Author SHA1 Message Date
Fedora Release Engineering
195ab5d0cc Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild 2026-07-17 08:23:42 +00:00
Python Maint
7db9d7666b Rebuilt for Python 3.15 2026-06-04 15:56:10 +02:00
Tomáš Hrnčiar
da001d76bc 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
2026-05-04 11:25:45 +02:00
Fedora Release Engineering
5090882e16 Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild 2026-01-17 19:48:58 +00:00
accb86a950
Support building with old setuptools (pre-PEP 639)
Signed-off-by: Michel Lind <salimma@fedoraproject.org>
2025-12-16 16:35:00 +00:00
3 changed files with 53 additions and 3 deletions

1
series Normal file
View file

@ -0,0 +1 @@
vdirsyncer-revert-license-metadata-update.diff

View file

@ -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",

View file

@ -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: 7%{?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
@ -36,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
@ -83,7 +94,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 +161,21 @@ sh build.sh tests
%doc docs/_build/html docs/_build/text
%changelog
* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.20.0-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
* Thu Jun 04 2026 Python Maint <python-maint@redhat.com> - 0.20.0-6
- Rebuilt for Python 3.15
* Thu May 07 2026 Tomáš Hrnčiar <thrnciar@redhat.com> - 0.20.0-5
- Add BR on python3-pkg-resources, setuptools 82 dropped pkg_resources
* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.20.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
* Tue Dec 16 2025 Michel Lind <salimma@fedoraproject.org> - 0.20.0-3
- Support building with old setuptools (pre-PEP 639)
* Fri Sep 19 2025 Python Maint <python-maint@redhat.com> - 0.20.0-2
- Rebuilt for Python 3.14.0rc3 bytecode