#3 Update to 3.3 (close RHBZ#2120137)
Merged 2 years ago by music. Opened 2 years ago by music.
rpms/ music/jrnl v3.1  into  rawhide

file modified
+3
@@ -12,3 +12,6 @@ 

  /jrnl-2.8.3.tar.gz

  /jrnl-2.8.4.tar.gz

  /jrnl-3.0.tar.gz

+ /jrnl-3.1.tar.gz

+ /jrnl-3.2.tar.gz

+ /jrnl-3.3.tar.gz

file modified
+20 -23
@@ -1,5 +1,5 @@ 

  Name:           jrnl

- Version:        3.0

+ Version:        3.3

  Release:        %autorelease

  Summary:        Collect your thoughts and notes without leaving the command line

  
@@ -12,8 +12,17 @@ 

  

  BuildRequires:  python3-devel

  

+ BuildRequires:  dos2unix

  BuildRequires:  help2man

  

+ # The mkdocs-generated HTML documentation is not suitable for packaging; see

+ # https://bugzilla.redhat.com/show_bug.cgi?id=2006555 for discussion.

+ #

+ # We can package the Markdown sources without building them; they are still

+ # relatively legible as plain text. However, the text documentation files are

+ # no longer large or numerous enough to justify a separate -doc subpackage.

+ Obsoletes:      jrnl-doc < 3.3-1

+ 

  %description

  jrnl is a simple journal application for the command line.

  
@@ -22,25 +31,15 @@ 

  encryption.

  

  

- %package doc

- Summary:        Documentation for jrnl

- 

- # The mkdocs-generated HTML documentation is not suitable for packaging; see

- # https://bugzilla.redhat.com/show_bug.cgi?id=2006555 for discussion.

- #

- # We can package the Markdown sources without building them; they are still

- # relatively legible as plain text.

- 

- %description doc

- The jrnl-doc package contains detailed documentation for jrnl.

- 

- 

  %prep

- %autosetup -n jrnl-%{version} -p1

+ %autosetup -n jrnl-%{version}

  

- # Exception: gherkin-terminal-reporter is not compatible with 'xdist' plugin.

- # https://github.com/pytest-dev/pytest-bdd/issues/501

- sed -r -i '/"--gherkin-terminal-reporter"/d' pyproject.toml

+ dos2unix \

+     SECURITY.md \

+     docs/external-editors.md \

+     docs/journal-types.md \

+     docs/reference-command-line.md \

+     docs/reference-config-file.md

  

  

  %generate_buildrequires
@@ -68,12 +67,7 @@ 

  

  %files -f %{pyproject_files}

  %license LICENSE.md

- %{_bindir}/jrnl

- %{_mandir}/man1/jrnl.1*

  

- 

- %files doc

- %license LICENSE.md

  %doc CHANGELOG.md

  %doc CODE_OF_CONDUCT.md

  %doc CONTRIBUTING.md
@@ -81,6 +75,9 @@ 

  %doc SECURITY.md

  %doc docs/

  

+ %{_bindir}/jrnl

+ %{_mandir}/man1/jrnl.1*

+ 

  

  %changelog

  %autochangelog

file modified
+1 -1
@@ -1,1 +1,1 @@ 

- SHA512 (jrnl-3.0.tar.gz) = 80c086d1d360deb6bde10aa6a5b284d7e99d1c87ff2ff165aed3611fcfb132577a41c1a7c7d84d2eebb176f49685a1e7351b5c9041bdb17c9098966d5d5313bc

+ SHA512 (jrnl-3.3.tar.gz) = 70e111846381b046f83e51c35aeb1ba6747862179c09ecdf39d04a7847723b1e69a2fbc60d7be9cccf53c1b5846dfff7dd0b9820859c93fae579d6be8117eacd

rebased onto 82a8e61

2 years ago

rebased onto 7a0ce87

2 years ago

rebased onto e2781b3

2 years ago

Pull-Request has been merged by music

2 years ago