PR#5: Update to 4.0.1 (close RHBZ#2216368) - rpms/jrnl

rpms / jrnl

#5 Update to 4.0.1 (close RHBZ#2216368)

Merged 11 months ago by music. Opened 11 months ago by music.

rpms/ music/jrnl v4.0.1 into rawhide

Update to 4.0.1 (close RHBZ#2216368)

Benjamin A. Beasley • 11 months ago

b399f69

.gitignore

file modified

		`@@ -16,3 +16,4 @@`
		`/jrnl-3.2.tar.gz`
		`/jrnl-3.3.tar.gz`
		`/jrnl-4.0.tar.gz`
		`+ /jrnl-4.0.1.tar.gz`

0001-Revert-Lock-ruamel.yaml-version-until-bug-is-fixed-1.patch

file removed

-16

		`@@ -1,16 +0,0 @@`
		`- diff --git a/pyproject.toml b/pyproject.toml`
		`- index 675d4f4..0bcb42d 100644`
		`- --- a/pyproject.toml`
		`- +++ b/pyproject.toml`
		`- @@ -36,7 +36,7 @@ keyring = ">=21.0" # https://github.com/jaraco/keyring#integration`
		`- parsedatetime = ">=2.6"`
		`- python-dateutil = "^2.8" # https://github.com/dateutil/dateutil/blob/master/RELEASING`
		`- pyxdg = ">=0.27.0"`
		`- -"ruamel.yaml" = "0.17.21" # locked to this version until bug is resolved: https://github.com/jrnl-org/jrnl/issues/1736`
		`- +"ruamel.yaml" = "^0.17.21"`
		`- rich = ">=12.2.0, <14.0.0"`
		`-`
		`- # dayone-only deps`
		`- --`
		`- 2.40.1`
		`-`

jrnl.spec

file modified

+2 -17

		`@@ -1,5 +1,5 @@`
		`Name: jrnl`
		`- Version: 4.0`
		`+ Version: 4.0.1`
		`Release: %autorelease`
		`Summary: Collect your thoughts and notes without leaving the command line`

		`@@ -8,21 +8,6 @@`
		`%global forgeurl https://github.com/jrnl-org/jrnl/`
		`Source: %{forgeurl}/archive/v%{version}/jrnl-%{version}.tar.gz`

		`- # Revert “Lock ruamel.yaml version until bug is fixed (#1738)”,`
		`- # 0b55c477e17fa7ac4d7d91bbda5d712f3ef8b67b`
		`- #`
		`- # That commit corresponds to PR “Lock ruamel.yaml version to v0.17.21 until bug`
		`- # is fixed”, https://github.com/jrnl-org/jrnl/pull/1738`
		`- #`
		`- # The bug in question was “Failing Mac test on develop branch”,`
		`- # https://github.com/jrnl-org/jrnl/issues/1736; since it was Mac-specific, we`
		`- # can safely remove the version bound downstream.`
		`- #`
		`- # It looks like the version bound is already removed upstream in 4.0.1~beta.`
		`- #`
		`- # The patch is hand-edited to remove irrelevant poetry.lock diffs.`
		`- Patch: 0001-Revert-Lock-ruamel.yaml-version-until-bug-is-fixed-1.patch`
		`-`
		`BuildArch: noarch`

		`BuildRequires: python3-devel`
		`@@ -47,7 +32,7 @@`


		`%prep`
		`- %autosetup -n jrnl-%{version} -p1`
		`+ %autosetup -n jrnl-%{version}`

		`dos2unix \`
		`SECURITY.md \`

sources

file modified

+1 -1

		`@@ -1,1 +1,1 @@`
		`- SHA512 (jrnl-4.0.tar.gz) = a472248bb8be17eb145d583f9c53606463fb39cb8477ee6680e6ed0ede4456795ee905b6bdf403c0470f775b53d1b311b184b5eccce1c1f52468c83d32fe7d51`
		`+ SHA512 (jrnl-4.0.1.tar.gz) = b116b380e32654b33a2c5d211096df675476f25c788a7943cc0e580cda0dae5f9a9123a17f1c06a20e35360bd737a83f1e998469ee002824dbec112ebaed2f57`

music commented 11 months ago

https://github.com/jrnl-org/jrnl/compare/v4.0...v4.0.1

https://github.com/jrnl-org/jrnl/releases/tag/v4.0.1

## jrnl 4.0.1

### Fixed bugs:

- `jrnl` crashes when running `jrnl --list --format json` and `jrnl --list --format yaml`
- Refactor `--template` code

Compatible bugfix update for F38/F39.