Accepting request 1104456 from devel:languages:haskell

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/1104456
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git-annex?expand=0&rev=33

0001-persistent-2.12.0.1-include-the-code-from-persistent.patch

@@ -1,7 +1,7 @@
-From 924aab1061129a9ed1b158c5df874bf13c5d44fc Mon Sep 17 00:00:00 2001
+From f2b75ec2d27a671d5074136bf3b1bab25e3562fb Mon Sep 17 00:00:00 2001
 From: Peter Simons <simons@cryp.to>
-Date: Thu, 30 Mar 2023 09:35:58 +0200
+Date: Thu, 10 Aug 2023 15:39:56 +0200
-Subject: [PATCH] persistent >= 2.12.0.1 include the code from
+Subject: [PATCH] persistent >= 2.12.0.1 includes the code from
  persistent-template
 
 persistent-template has been deprecated.
@@ -14,7 +14,7 @@ persistent-template has been deprecated.
  5 files changed, 1 insertion(+), 14 deletions(-)
 
 diff --git a/Database/ContentIdentifier.hs b/Database/ContentIdentifier.hs
-index aa595a98c..7d868438d 100644
+index e847c00cce..be7673facc 100644
 --- a/Database/ContentIdentifier.hs
 +++ b/Database/ContentIdentifier.hs
 @@ -5,17 +5,14 @@
@@ -22,7 +22,7 @@ index aa595a98c..7d868438d 100644
   -}
  
 -{-# LANGUAGE CPP #-}
- {-# LANGUAGE QuasiQuotes, TypeFamilies, TemplateHaskell #-}
+ {-# LANGUAGE QuasiQuotes, TypeFamilies, TypeOperators, TemplateHaskell #-}
  {-# LANGUAGE OverloadedStrings, GADTs, FlexibleContexts, EmptyDataDecls #-}
  {-# LANGUAGE MultiParamTypeClasses, GeneralizedNewtypeDeriving #-}
  {-# LANGUAGE RankNTypes #-}
@@ -36,7 +36,7 @@ index aa595a98c..7d868438d 100644
  module Database.ContentIdentifier (
  	ContentIdentifierHandle,
 diff --git a/Database/Export.hs b/Database/Export.hs
-index b5c58afd0..346cffbef 100644
+index b9d9879da0..e51d852024 100644
 --- a/Database/Export.hs
 +++ b/Database/Export.hs
 @@ -5,17 +5,14 @@
@@ -44,7 +44,7 @@ index b5c58afd0..346cffbef 100644
   -}
  
 -{-# LANGUAGE CPP #-}
- {-# LANGUAGE QuasiQuotes, TypeFamilies, TemplateHaskell #-}
+ {-# LANGUAGE QuasiQuotes, TypeFamilies, TypeOperators, TemplateHaskell #-}
  {-# LANGUAGE OverloadedStrings, GADTs, FlexibleContexts #-}
  {-# LANGUAGE MultiParamTypeClasses, GeneralizedNewtypeDeriving #-}
  {-# LANGUAGE RankNTypes #-}
@@ -58,10 +58,10 @@ index b5c58afd0..346cffbef 100644
  module Database.Export (
  	ExportHandle,
 diff --git a/Database/Fsck.hs b/Database/Fsck.hs
-index 61e932e3d..0bb7b7b29 100644
+index cce5528100..2ff4eb6bb5 100644
 --- a/Database/Fsck.hs
 +++ b/Database/Fsck.hs
-@@ -5,17 +5,14 @@
+@@ -5,7 +5,6 @@
   - Licensed under the GNU AGPL version 3 or higher.
   -}
  
@@ -69,9 +69,10 @@ index 61e932e3d..0bb7b7b29 100644
  {-# LANGUAGE QuasiQuotes, TypeFamilies, TemplateHaskell #-}
  {-# LANGUAGE OverloadedStrings, GADTs, FlexibleContexts #-}
  {-# LANGUAGE MultiParamTypeClasses, GeneralizedNewtypeDeriving #-}
- {-# LANGUAGE DataKinds, FlexibleInstances #-}
+@@ -13,10 +12,8 @@
  {-# LANGUAGE RankNTypes #-}
  {-# LANGUAGE UndecidableInstances #-}
+ {-# LANGUAGE TypeOperators #-}
 -#if MIN_VERSION_persistent_template(2,8,0)
  {-# LANGUAGE DerivingStrategies #-}
  {-# LANGUAGE StandaloneDeriving #-}
@@ -80,7 +81,7 @@ index 61e932e3d..0bb7b7b29 100644
  module Database.Fsck (
  	FsckHandle,
 diff --git a/Database/Keys/SQL.hs b/Database/Keys/SQL.hs
-index c97a4280b..55666c597 100644
+index 7fea5cf2bb..c9c7e020c1 100644
 --- a/Database/Keys/SQL.hs
 +++ b/Database/Keys/SQL.hs
 @@ -5,17 +5,14 @@
@@ -88,7 +89,7 @@ index c97a4280b..55666c597 100644
   -}
  
 -{-# LANGUAGE CPP #-}
- {-# LANGUAGE QuasiQuotes, TypeFamilies, TemplateHaskell #-}
+ {-# LANGUAGE QuasiQuotes, TypeFamilies, TypeOperators, TemplateHaskell #-}
  {-# LANGUAGE OverloadedStrings, GADTs, FlexibleContexts #-}
  {-# LANGUAGE MultiParamTypeClasses, GeneralizedNewtypeDeriving #-}
  {-# LANGUAGE RankNTypes, ScopedTypeVariables #-}
@@ -102,10 +103,10 @@ index c97a4280b..55666c597 100644
  module Database.Keys.SQL where
  
 diff --git a/git-annex.cabal b/git-annex.cabal
-index 65f10351c..f656e7e91 100644
+index 837680cbd5..893b816068 100644
 --- a/git-annex.cabal
 +++ b/git-annex.cabal
-@@ -347,8 +347,7 @@ Executable git-annex
+@@ -358,8 +358,7 @@ Executable git-annex
     time (>= 1.5.0),
     old-locale,
     persistent-sqlite (>= 2.8.1),
@@ -116,5 +117,5 @@ index 65f10351c..f656e7e91 100644
     microlens,
     aeson,
 -- 
-2.39.2
+2.41.0
 

git-annex-10.20230626.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:acb92f104c10dfe8f0790af4d6d758e6e971bd908a87588f600d8ae9b2b27e57
-size 8880902

git-annex-10.20230802.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:21a7a6d81d4341e8381f4b3b90cda3ca6a39362017f6b56f29e6ec375bf085b6
+size 8945618

git-annex.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Aug  2 20:09:47 UTC 2023 - Peter Simons <psimons@suse.com>
+
+- Update git-annex to version 10.20230802.
+  Upstream has edited the change log file since the last release in
+  a non-trivial way, i.e. they did more than just add a new entry
+  at the top. You can review the file at:
+  http://hackage.haskell.org/package/git-annex-10.20230802/src/CHANGELOG
+
 -------------------------------------------------------------------
 Mon Jun 26 15:55:00 UTC 2023 - Peter Simons <psimons@suse.com>
 

git-annex.spec

@@ -17,7 +17,7 @@
 
 
 Name:           git-annex
-Version:        10.20230626
+Version:        10.20230802
 Release:        0
 Summary:        Manage files with git, without checking their contents into git
 License:        AGPL-3.0-or-later AND GPL-3.0-or-later AND BSD-2-Clause AND MIT AND GPL-2.0-only
@@ -65,8 +65,6 @@ BuildRequires:  ghc-concurrent-output-devel
 BuildRequires:  ghc-concurrent-output-prof
 BuildRequires:  ghc-conduit-devel
 BuildRequires:  ghc-conduit-prof
-BuildRequires:  ghc-connection-devel
-BuildRequires:  ghc-connection-prof
 BuildRequires:  ghc-containers-devel
 BuildRequires:  ghc-containers-prof
 BuildRequires:  ghc-criterion-devel
@@ -275,7 +273,7 @@ Optional dependency offering bash completion for git-annex
 
 %install
 %ghc_bin_install
-make DESTDIR=%{buildroot} BUILDER=./Setup install-mans install-completions install-desktop
+make DESTDIR=%{buildroot} BUILDER=./Setup install-bins install-mans install-completions install-desktop
 rm %{buildroot}%{_datadir}/fish/vendor_completions.d/git-annex.fish
 rm %{buildroot}%{_datadir}/zsh/site-functions/_git-annex