Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package git-annex for openSUSE:Factory checked in at 2023-06-22 23:25:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/git-annex (Old) and /work/SRC/openSUSE:Factory/.git-annex.new.15902 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "git-annex" Thu Jun 22 23:25:40 2023 rev:31 rq:1094458 version:10.20230407 Changes: -------- --- /work/SRC/openSUSE:Factory/git-annex/git-annex.changes 2023-04-14 13:13:00.983542674 +0200 +++ /work/SRC/openSUSE:Factory/.git-annex.new.15902/git-annex.changes 2023-06-22 23:26:15.681902863 +0200 @@ -1,0 +2,7 @@ +Wed Jun 21 14:52:10 UTC 2023 - Peter Simons <psim...@suse.com> + +- Apply "0001-Adapt-code-to-optparse-applicative-0.18.1-and-later.patch" + to allow git-annex to build with the latest release of the + optparse-applicative library. + +------------------------------------------------------------------- @@ -1361 +1367,0 @@ - New: ---- 0001-Adapt-code-to-optparse-applicative-0.18.1-and-later.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ git-annex.spec ++++++ --- /var/tmp/diff_new_pack.q2JI3k/_old 2023-06-22 23:26:17.089910043 +0200 +++ /var/tmp/diff_new_pack.q2JI3k/_new 2023-06-22 23:26:17.097910084 +0200 @@ -24,6 +24,7 @@ URL: https://hackage.haskell.org/package/%{name} Source0: https://github.com/opensuse-haskell/git-annex/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz Patch0: 0001-persistent-2.12.0.1-include-the-code-from-persistent.patch +Patch1: 0001-Adapt-code-to-optparse-applicative-0.18.1-and-later.patch BuildRequires: bash-completion BuildRequires: chrpath BuildRequires: curl ++++++ 0001-Adapt-code-to-optparse-applicative-0.18.1-and-later.patch ++++++ >From e2c69174088403e41fd4988082509f7bc2bc39dd Mon Sep 17 00:00:00 2001 From: Peter Simons <sim...@cryp.to> Date: Wed, 21 Jun 2023 16:46:54 +0200 Subject: [PATCH] Adapt code to optparse-applicative 0.18.1 and later. optparse-applicative switched to the 'prettyprinter' library in its latest release, which means the 'H.text' function has disappeared. Instead, 'H.pretty' can be used to convert all 'Pretty a' types into a renderable document. --- CmdLine.hs | 2 +- git-annex.cabal | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CmdLine.hs b/CmdLine.hs index a170434107..004198c40a 100644 --- a/CmdLine.hs +++ b/CmdLine.hs @@ -116,7 +116,7 @@ parseCmd progname progdesc allargs allcmds getparser = <*> getparser c <*> parserAnnexOptions (cmdannexoptions c) synopsis n d = n ++ " - " ++ d - intro = mconcat $ concatMap (\l -> [H.text l, H.line]) + intro = mconcat $ concatMap (\l -> [H.pretty l, H.line]) (synopsis progname progdesc : commandList allcmds) {- Selects the Command that matches the subcommand name. diff --git a/git-annex.cabal b/git-annex.cabal index 53270e572a..4abbc7b686 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -311,7 +311,7 @@ Executable git-annex Build-Depends: base (>= 4.11.1.0 && < 5.0), network-uri (>= 2.6), - optparse-applicative (>= 0.14.1), + optparse-applicative (>= 0.18.1), containers (>= 0.5.8), exceptions (>= 0.6), stm (>= 2.3), -- 2.40.1
