From 22904cf7890d28f037d2695d95a5d35f30cdca56 Mon Sep 17 00:00:00 2001
From: rdobuilder <dev@lists.rdoproject.org>
Date: Feb 06 2025 07:26:45 +0000
Subject: Update to 1.14.1


Related-to: https://review.rdoproject.org/r/q/Ie7b8aa69771d49f86ed3440867fbe8b080777800

---

diff --git a/.python-alembic.metadata b/.python-alembic.metadata
index f9e0125..199a853 100644
--- a/.python-alembic.metadata
+++ b/.python-alembic.metadata
@@ -1 +1 @@
-6d234f2a5aa80285fbc7f07c415cc53bc831f8e4  SOURCES/alembic-1.14.0.tar.gz
+91b4c92e9c2d1997c6ec28859d4d760b2956d45a  SOURCES/alembic-1.14.1.tar.gz
diff --git a/SOURCES/python-alembic-1.14.1-no-tzdata-pkg.patch b/SOURCES/python-alembic-1.14.1-no-tzdata-pkg.patch
new file mode 100644
index 0000000..d5b2c43
--- /dev/null
+++ b/SOURCES/python-alembic-1.14.1-no-tzdata-pkg.patch
@@ -0,0 +1,11 @@
+diff -up alembic-1.14.1/setup.cfg.no-tzdata-pkg alembic-1.14.1/setup.cfg
+--- alembic-1.14.1/setup.cfg.no-tzdata-pkg	2025-01-20 00:14:50.753531700 +0100
++++ alembic-1.14.1/setup.cfg	2025-02-05 11:38:55.272656977 +0100
+@@ -46,7 +46,6 @@ install_requires =
+ [options.extras_require]
+ tz = 
+ 	backports.zoneinfo;python_version<"3.9"
+-	tzdata
+ 
+ [options.package_data]
+ alembic = *.pyi, py.typed
diff --git a/SPECS/python-alembic.spec b/SPECS/python-alembic.spec
index bc5815a..8da1327 100644
--- a/SPECS/python-alembic.spec
+++ b/SPECS/python-alembic.spec
@@ -1,6 +1,6 @@
 
 Name:             python-alembic
-Version:          1.14.0
+Version:          1.14.1
 Release:          1%{?dist}
 Summary:          Database migration tool for SQLAlchemy
 
@@ -9,6 +9,10 @@ License:          MIT
 URL:              https://pypi.io/project/alembic
 Source0:          %{pypi_source alembic}
 
+# Specific to Fedora: The tzdata Python package is essentially just a copy of
+# the main tzdata package, we don’t need to have it.
+Patch:            python-alembic-1.14.1-no-tzdata-pkg.patch
+
 BuildArch:        noarch
 
 BuildRequires:    help2man
@@ -20,6 +24,8 @@ BuildRequires:    python3-pytest
 BuildRequires:    python3-pytest-xdist
 %endif
 
+BuildRequires:    tzdata
+
 %global _description %{expand:
 Alembic is a database migrations tool written by the author of SQLAlchemy. A
 migrations tool offers the following functionality:
@@ -43,7 +49,17 @@ Summary:          %summary
 %description -n python3-alembic %_description
 
 
-%pyproject_extras_subpkg -n python3-alembic tz
+# Don’t use the %%pyproject_extras_subpkg macro, we want it to depend on the
+# main tzdata package, not python3dist(tzdata) (which we don’t have).
+
+%package -n python3-alembic+tz
+Summary: Metapackage for python3-alembic: tz extra
+Requires: python3-alembic = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: tzdata
+
+%description -n python3-alembic+tz
+This is a metapackage bringing in tz extra requires for python3-alembic.
+It contains no code, just makes sure the dependencies are installed.
 
 
 %prep
@@ -53,7 +69,7 @@ Summary:          %summary
 rm -rvf docs/_static
 # https://docs.fedoraproject.org/en-US/packaging-guidelines/Python/#_linters
 sed -r -i 's/^([[:blank:]]*(black|zimports))\b/# &/' tox.ini
-# Don't treat DeprecationWarnings as errros in tests
+# Don't treat DeprecationWarnings as errors in tests
 sed -i '/"error", category=DeprecationWarning/d' alembic/testing/warnings.py
 
 
@@ -99,7 +115,17 @@ ln -s alembic-%{python3_version}.1 %{buildroot}%{_mandir}/man1/alembic.1
 %{_mandir}/man1/alembic-%{python3_version}.1{,.*}
 
 
+%files -n python3-alembic+tz
+%ghost %{python3_sitelib}/*.dist-info
+
+
 %changelog
+* Wed Feb 05 2025 Nils Philippsen <nils@tiptoe.de> - 1.14.1-1
+- Update to 1.14.1
+
+* Sat Jan 18 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
 * Tue Nov 05 2024 František Zatloukal <fzatlouk@redhat.com> - 1.14.0-1
 - Update to 1.14.0 (RHBZ#2323715)