From a1d2ef30491785fce3d0b54167549f85bb791ce7 Mon Sep 17 00:00:00 2001
From: Benjamin A. Beasley <code@musicinmybrain.net>
Date: Apr 13 2024 11:52:07 +0000
Subject: Adjust typer dependency for typer 0.12.1


Downstream-only for now, since upstream is slow-moving and pins all dependencies.

For an explanation of what is going on here, see
https://typer.tiangolo.com/release-notes/#0121,
https://github.com/tiangolo/typer/discussions/785, and
https://github.com/hoechenberger/openneuro-py/pull/155.

---

diff --git a/pgadmin4.spec b/pgadmin4.spec
index d79d950..07f8377 100644
--- a/pgadmin4.spec
+++ b/pgadmin4.spec
@@ -7,7 +7,7 @@ Name:           pgadmin4
 # NOTE: Also regenerate requires as indicated below when updating!
 # Verify Patch4 on next update
 Version:        8.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Administration tool for PostgreSQL
 
 # i686, armv7hl: The webpack terser plugin aborts with JS heap memory exhaustion on these arches
@@ -115,7 +115,7 @@ Requires: (python3dist(google-api-python-client) >= 2 with python3dist(google-ap
 Requires: python3dist(google-auth-oauthlib) >= 0.8
 Requires: python3dist(keyring) >= 24
 Requires: python3dist(werkzeug) >= 2.3
-Requires: python3dist(typer) >= 0.9
+Requires: python3dist(typer-slim[standard])
 Requires: python3dist(setuptools) >= 68
 Requires: (python3dist(jsonformatter) >= 0.3.2 with python3dist(jsonformatter) < 0.4)
 
@@ -272,6 +272,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
 
 
 %changelog
+* Sat Apr 13 2024 Benjamin A. Beasley <code@musicinmybrain.net> - 8.5-2
+- Adjust typer dependency for typer 0.12.1
+
 * Thu Apr 11 2024 Sandro Mani <manisandro@gmail.com> - 8.5-1
 - Update to 8.5
 
diff --git a/pgadmin4_requirements.patch b/pgadmin4_requirements.patch
index 1fd2d0e..a8ba4d7 100644
--- a/pgadmin4_requirements.patch
+++ b/pgadmin4_requirements.patch
@@ -80,7 +80,7 @@ diff -rupN --no-dereference pgadmin4-8.5/requirements.txt pgadmin4-8.5-new/requi
 +google-auth-oauthlib>=0.8.0
 +keyring>=24.0.0
 +Werkzeug>=2.3.0
-+typer[all]>=0.9.0
++typer-slim[standard]
 +setuptools>=68.0
  jsonformatter~=0.3.2
 diff -rupN --no-dereference pgadmin4-8.5/web/pgadmin/authenticate/mfa/email.py pgadmin4-8.5-new/web/pgadmin/authenticate/mfa/email.py