[rpms/jrnl] f44: Update to version 4.6 (close RHBZ#2512481)

[Benjamin A. Beasley <code@musicinmybrain.net>]

A new commit has been pushed.

Repo   : rpms/jrnl
Branch : f44
Commit : 17972b9c40ef3f1baebaffc5dc0dd0df33766b7a
Author : Benjamin A. Beasley <code@musicinmybrain.net>
Date   : 2026-08-07T16:38:04+01:00
Stats  : +22/-101 in 6 file(s)
URL    : https://src.fedoraproject.org/rpms/jrnl/c/17972b9c40ef3f1baebaffc5dc0dd0df33766b7a?branch=f44

Log:
Update to version 4.6 (close RHBZ#2512481)

---
diff --git a/.gitignore b/.gitignore
index 7677da5..dc1dc12 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@
 /jrnl-4.2.tar.gz
 /jrnl-4.2.1.tar.gz
 /jrnl-4.3.tar.gz
+/jrnl-4.6.tar.gz

diff --git a/0001-Downstream-only-do-not-upper-bound-the-Python-interp.patch b/0001-Downstream-only-do-not-upper-bound-the-Python-interp.patch
index e9dc704..def7857 100644
--- a/0001-Downstream-only-do-not-upper-bound-the-Python-interp.patch
+++ b/0001-Downstream-only-do-not-upper-bound-the-Python-interp.patch
@@ -1,8 +1,8 @@
-From 7acb614de1610ea6eb821a76f04bf501ea6ab2a2 Mon Sep 17 00:00:00 2001
+From e925a32aae77169dce40e0f62ba989ef649abc96 Mon Sep 17 00:00:00 2001
 From: "Benjamin A. Beasley" <code@musicinmybrain.net>
 Date: Thu, 2 May 2024 10:30:25 -0400
-Subject: [PATCH 1/2] Downstream-only: do not upper-bound the Python
- interpreter version
+Subject: [PATCH] Downstream-only: do not upper-bound the Python interpreter
+ version
 
 We must integrate with new Python interpreter versions whether upstream
 is ready or not.
@@ -11,18 +11,18 @@ is ready or not.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/pyproject.toml b/pyproject.toml
-index f945424..efa6057 100644
+index c33b3c1..762bc9c 100644
 --- a/pyproject.toml
 +++ b/pyproject.toml
-@@ -11,7 +11,7 @@ authors = [
+@@ -12,7 +12,7 @@ authors = [
    {name = "jrnl contributors", email = "maintainers@jrnl.sh"}
  ]
- maintainers = [{name = "Jonathan Wren and Micah Ellison", email = "maintainers@jrnl.sh"}]
--requires-python = '>=3.10.0,<3.15'
-+requires-python = '>=3.10.0'
+ maintainers = [{name = "Jonathan Wren, Micah Ellison, Aaron Lichtman", email = "maintainers@jrnl.sh"}]
+-requires-python = '>=3.11.0,<3.15'
++requires-python = '>=3.11.0'
  dependencies = [
    'colorama (>=0.4)', # https://github.com/tartley/colorama/blob/master/CHANGELOG.rst
    'cryptography (>=3.0)', # https://cryptography.io/en/latest/api-stability.html
 -- 
-2.53.0
+2.55.0
 

diff --git a/0002-Downstream-only-do-not-upper-bound-the-version-of-ri.patch b/0002-Downstream-only-do-not-upper-bound-the-version-of-ri.patch
deleted file mode 100644
index 1e8ea6a..0000000
--- a/0002-Downstream-only-do-not-upper-bound-the-version-of-ri.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 78827316e4caf0389350cfe6bcb950caf94a1487 Mon Sep 17 00:00:00 2001
-From: "Benjamin A. Beasley" <code@musicinmybrain.net>
-Date: Thu, 26 Feb 2026 05:19:07 +0000
-Subject: [PATCH 2/2] Downstream-only: do not upper-bound the version of rich
-
-Upstream limits this to the current minor version, but we must integrate
-with new releases whether upstream is ready or not. We would rather deal
-with a few possible, usually-minor test failures than a sudden failure
-to install.
----
- pyproject.toml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/pyproject.toml b/pyproject.toml
-index efa6057..0258e01 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -21,7 +21,7 @@ dependencies = [
-   'pyxdg (>=0.27.0)',
-   'ruamel.yaml (>=0.17.22)',
-   'ruamel.yaml.clib (>=0.2.12)', # https://sourceforge.net/p/ruamel-yaml-clib/tickets/36/
--  'rich (>=14.3.2,<14.4.0)',
-+  'rich (>=14.3.2)',
-   'tzlocal (>=4.0)' # https://github.com/regebro/tzlocal/blob/master/CHANGES.txt
- ]
- 
--- 
-2.53.0
-

diff --git a/6ff5b53f1e9891fde289713cee053cb401b43d10.patch b/6ff5b53f1e9891fde289713cee053cb401b43d10.patch
deleted file mode 100644
index 7b37844..0000000
--- a/6ff5b53f1e9891fde289713cee053cb401b43d10.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 6ff5b53f1e9891fde289713cee053cb401b43d10 Mon Sep 17 00:00:00 2001
-From: Aaron Lichtman <aaronlichtman@gmail.com>
-Date: Tue, 14 Jul 2026 22:34:39 -0700
-Subject: [PATCH] test: fix version string mismatch between pyproject.toml and
- __version__.py
-
-poetry version normalizes input (e.g. v4.3-beta -> 4.3b0), but the
-release workflow wrote the raw, unnormalized input into
-jrnl/__version__.py, causing the two files to permanently disagree.
-Derive __version__.py from `poetry version -s` instead, and move the
-"v" prefix expected by the --version output into the display string
-itself rather than baking it into __version__.
----
- .github/workflows/release.yaml | 2 +-
- jrnl/__version__.py            | 2 +-
- jrnl/commands.py               | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
-index 24b307bc6..ebdfb27d9 100644
---- a/.github/workflows/release.yaml
-+++ b/.github/workflows/release.yaml
-@@ -82,7 +82,7 @@ jobs:
-       if: ${{ github.event.inputs.include_repo_version == 'true' }}
-       run: |
-         poetry version "$JRNL_VERSION"
--        echo "__version__ = \"$JRNL_VERSION\"" > jrnl/__version__.py
-+        echo "__version__ = \"$(poetry version -s)\"" > jrnl/__version__.py
- 
-     - name: Commit updated files
-       if: ${{ github.event.inputs.include_repo_version == 'true' && github.repository == env.HOME_REPO }}
-diff --git a/jrnl/__version__.py b/jrnl/__version__.py
-index b9584cae0..ba7116df7 100644
---- a/jrnl/__version__.py
-+++ b/jrnl/__version__.py
-@@ -1 +1 @@
--__version__ = "v4.3"
-+__version__ = "4.3"
-diff --git a/jrnl/commands.py b/jrnl/commands.py
-index cbb695e35..3acd2ddc0 100644
---- a/jrnl/commands.py
-+++ b/jrnl/commands.py
-@@ -46,7 +46,7 @@ def preconfig_version(_) -> None:
-     from jrnl import __version__
- 
-     output = f"""
--    {__title__} {__version__}
-+    {__title__} v{__version__}
- 
-     Copyright © 2012-2023 jrnl contributors
- 

diff --git a/jrnl.spec b/jrnl.spec
index 49489f6..fdd5796 100644
--- a/jrnl.spec
+++ b/jrnl.spec
@@ -1,5 +1,5 @@
 Name:           jrnl
-Version:        4.3
+Version:        4.6
 Release:        %autorelease
 Summary:        Collect your thoughts and notes without leaving the command line
 
@@ -13,16 +13,6 @@ Source:         %{forgeurl}/archive/v%{version}/jrnl-%{version}.tar.gz
 # We must integrate with new Python interpreter versions whether upstream
 # is ready or not.
 Patch:          0001-Downstream-only-do-not-upper-bound-the-Python-interp.patch
-# Downstream-only: do not upper-bound the version of rich
-#
-# Upstream limits this to the current minor version, but we must integrate
-# with new releases whether upstream is ready or not. We would rather deal
-# with a few possible, usually-minor test failures than a sudden failure
-# to install.
-Patch:          0002-Downstream-only-do-not-upper-bound-the-version-of-ri.patch
-# test: fix version string mismatch between pyproject.toml and __version__.py
-# https://github.com/jrnl-org/jrnl/commit/6ff5b53f1e9891fde289713cee053cb401b43d10
-Patch:          %{forgeurl}/commit/6ff5b53f1e9891fde289713cee053cb401b43d10.patch
 
 BuildSystem:    pyproject
 BuildOption(install): --assert-license jrnl
@@ -42,6 +32,16 @@ encryption.
 
 
 %prep -a
+# Downstream-only: do not upper-bound the version of rich
+#
+# Upstream limits this to the current minor version, but we must integrate with
+# new releases whether upstream is ready or not. We would rather deal with a
+# few possible, usually-minor test failures than a sudden failure to install.
+%pyproject_patch_dependency rich:drop_upper
+# Also, change the minimum version from 15 to 14 so we can try to ship the
+# security fix for GHSA-rhx6-37mm-5q9r in F44.
+%pyproject_patch_dependency rich:set_lower:14
+
 dos2unix --keepdate \
     SECURITY.md \
     docs/external-editors.md \

diff --git a/sources b/sources
index 63e4db3..0dbb010 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (jrnl-4.3.tar.gz) = eb8189dc2fe2fcfbb176886f665a207ba20119530faf7fda63f5023c5451964ca250b94ecdbd06f4abb1ee2a146a30039d6da5ce26b35b13bf14950e2418b6fe
+SHA512 (jrnl-4.6.tar.gz) = ff77de2d9ebc48dbff3618690e1f6a9ba31c59f2720063bde4c862ee3968ac5ec71fbd4c9a085f80618375d2b5a6dacbc65b5d49fea284592b594cd2a8c8228a