[rpms/jrnl] rawhide: Backport patch for version tests

[rpms/jrnl] rawhide: Backport patch for version tests

[Benjamin A. Beasley]

A new commit has been pushed.

Repo   : rpms/jrnl
Branch : rawhide
Commit : f26bedf9ca4e5b7b9ee2e13c22a8185739a42a59
Author : Benjamin A. Beasley <code@musicinmybrain.net>
Date   : 2026-07-15T08:11:32+01:00
Stats  : +55/-9 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/jrnl/c/f26bedf9ca4e5b7b9ee2e13c22a8185739a42a59?branch=rawhide

Log:
Backport patch for version tests

---
diff --git a/6ff5b53f1e9891fde289713cee053cb401b43d10.patch b/6ff5b53f1e9891fde289713cee053cb401b43d10.patch
new file mode 100644
index 0000000..7b37844
--- /dev/null
+++ b/6ff5b53f1e9891fde289713cee053cb401b43d10.patch
@@ -0,0 +1,51 @@
+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 432dfef..49489f6 100644
--- a/jrnl.spec
+++ b/jrnl.spec
@@ -20,6 +20,9 @@ Patch:          0001-Downstream-only-do-not-upper-bound-the-Python-interp.patch
 # 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
@@ -56,15 +59,7 @@ install --directory '%{buildroot}%{_mandir}/man1'
 
 
 %check -a
-# https://github.com/jrnl-org/jrnl/issues/2060#issuecomment-3964203676
-k="${k-}${k+ and }not test_install_jrnl_with_custom_expanded_default_journal_path"
-k="${k-}${k+ and }not test_install_jrnl_with_custom_relative_default_journal_path"
-k="${k-}${k+ and }not test_install_jrnl_with_default_options"
-k="${k-}${k+ and }not test_install_jrnl_with_encrypted_default_journal"
-k="${k-}${k+ and }not test_install_jrnl_with_encrypted_default_journal_with_no_entries"
-k="${k-}${k+ and }not test_update_version_number_in_config_file_when_running_newer_version"
-
-%tox -- -- -k "${k-}" -rs
+%tox -- -- -rs
 
 
 %files -f %{pyproject_files}