3 changed files with 3 additions and 53 deletions
--- a/1
+++ b/1
@ -1 +0,0 @@
-vdirsyncer-revert-license-metadata-update.diff
--- a/vdirsyncer-revert-license-metadata-update.diff
+++ b/vdirsyncer-revert-license-metadata-update.diff
@ -1,19 +0,0 @@
-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",
--- a/vdirsyncer.spec
+++ b/vdirsyncer.spec
@ -2,14 +2,6 @@
 # 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
@ -18,14 +10,12 @@

 Name:       vdirsyncer
 Version:    0.20.0
-Release:    7%{?dist}
+Release:    2%{?dist}
 Summary:    %{sum}

 License:    BSD-3-Clause
 URL:        https://github.com/pimutils/%{name}
-Source:     %{pypi_source}
-# conditional patches
-Patch1000:  vdirsyncer-revert-license-metadata-update.diff
+Source0:    %{pypi_source}

 BuildArch:  noarch
 Obsoletes:  python2-%{srcname} <= 0.12.1
@ -46,7 +36,6 @@ 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
@ -94,11 +83,7 @@ The vdirsyncer-doc package provides all the documentation
 for the vdirsyncer calendar/address-book synchronization utility.

 %prep
-%autosetup -N
-%autopatch -p1 -M 999
-%if %{with old_setuptools}
-%autopatch -p1 1000
-%endif
+%autosetup -p1

 %generate_buildrequires
 %pyproject_buildrequires
@ -161,21 +146,6 @@ 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
				`@ -1 +0,0 @@`
				`vdirsyncer-revert-license-metadata-update.diff`