Accepting request 1218581 from devel:languages:haskell

version update OBS-URL: https://build.opensuse.org/request/show/1218581 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git-annex?expand=0&rev=42
2024-10-28 14:19:50 +00:00 · 2024-10-28 14:19:50 +00:00 · 55f3833b71
commit 55f3833b71
parent 631d23d8f2 ec2a42852e
5 changed files with 117 additions and 35 deletions
--- a/0001-persistent-2.12.0.1-include-the-code-from-persistent.patch
+++ b/0001-persistent-2.12.0.1-include-the-code-from-persistent.patch
@ -14,10 +14,10 @@ persistent-template has been deprecated.
 git-annex.cabal               | 3 +--
 6 files changed, 1 insertion(+), 16 deletions(-)

-diff --git a/Database/ContentIdentifier.hs b/Database/ContentIdentifier.hs
-index bbf67dcfb1..3a399f7765 100644
--- a/Database/ContentIdentifier.hs
-+++ b/Database/ContentIdentifier.hs
+Index: git-annex-10.20240927/Database/ContentIdentifier.hs
+===================================================================
+--- git-annex-10.20240927.orig/Database/ContentIdentifier.hs	2024-09-30 23:15:57.000000000 +0000
+++ git-annex-10.20240927/Database/ContentIdentifier.hs	2024-10-26 13:36:42.452641193 +0000
@@ -12,10 +12,8 @@
 {-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE DataKinds, FlexibleInstances #-}
@ -29,10 +29,10 @@ index bbf67dcfb1..3a399f7765 100644
 
 module Database.ContentIdentifier (
 	ContentIdentifierHandle,
-diff --git a/Database/Export.hs b/Database/Export.hs
-index 2f0da8b231..6de86c7925 100644
--- a/Database/Export.hs
-+++ b/Database/Export.hs
+Index: git-annex-10.20240927/Database/Export.hs
+===================================================================
+--- git-annex-10.20240927.orig/Database/Export.hs	2024-09-30 23:15:57.000000000 +0000
+++ git-annex-10.20240927/Database/Export.hs	2024-10-26 13:36:42.452641193 +0000
@@ -5,17 +5,14 @@
  - Licensed under the GNU AGPL version 3 or higher.
  -}
@ -51,10 +51,10 @@ index 2f0da8b231..6de86c7925 100644
 
 module Database.Export (
 	ExportHandle,
-diff --git a/Database/Fsck.hs b/Database/Fsck.hs
-index cce5528100..2ff4eb6bb5 100644
--- a/Database/Fsck.hs
-+++ b/Database/Fsck.hs
+Index: git-annex-10.20240927/Database/Fsck.hs
+===================================================================
+--- git-annex-10.20240927.orig/Database/Fsck.hs	2024-09-30 23:15:57.000000000 +0000
+++ git-annex-10.20240927/Database/Fsck.hs	2024-10-26 13:36:42.452641193 +0000
@@ -5,7 +5,6 @@
  - Licensed under the GNU AGPL version 3 or higher.
  -}
@ -74,10 +74,10 @@ index cce5528100..2ff4eb6bb5 100644
 
 module Database.Fsck (
 	FsckHandle,
-diff --git a/Database/ImportFeed.hs b/Database/ImportFeed.hs
-index 2d44b0b9ea..84cd24bdab 100644
--- a/Database/ImportFeed.hs
-+++ b/Database/ImportFeed.hs
+Index: git-annex-10.20240927/Database/ImportFeed.hs
+===================================================================
+--- git-annex-10.20240927.orig/Database/ImportFeed.hs	2024-09-30 23:15:57.000000000 +0000
+++ git-annex-10.20240927/Database/ImportFeed.hs	2024-10-26 13:36:42.452641193 +0000
@@ -6,17 +6,14 @@
  - Licensed under the GNU AGPL version 3 or higher.
  -}
@ -96,10 +96,10 @@ index 2d44b0b9ea..84cd24bdab 100644
 
 module Database.ImportFeed (
 	ImportFeedDbHandle,
-diff --git a/Database/Keys/SQL.hs b/Database/Keys/SQL.hs
-index 2e40e39db3..6b36cd09d5 100644
--- a/Database/Keys/SQL.hs
-+++ b/Database/Keys/SQL.hs
+Index: git-annex-10.20240927/Database/Keys/SQL.hs
+===================================================================
+--- git-annex-10.20240927.orig/Database/Keys/SQL.hs	2024-09-30 23:15:57.000000000 +0000
+++ git-annex-10.20240927/Database/Keys/SQL.hs	2024-10-26 13:36:42.453641181 +0000
@@ -5,17 +5,14 @@
  - Licensed under the GNU AGPL version 3 or higher.
  -}
@ -118,11 +118,11 @@ index 2e40e39db3..6b36cd09d5 100644
 
 module Database.Keys.SQL where
 
-diff --git a/git-annex.cabal b/git-annex.cabal
-index 31e66f9f27..7bf1a8ae0c 100644
--- a/git-annex.cabal
-+++ b/git-annex.cabal
-@@ -247,8 +247,7 @@ Executable git-annex
+Index: git-annex-10.20240927/git-annex.cabal
+===================================================================
+--- git-annex-10.20240927.orig/git-annex.cabal	2024-09-30 23:15:57.000000000 +0000
+++ git-annex-10.20240927/git-annex.cabal	2024-10-26 13:36:42.453641181 +0000
+@@ -249,8 +249,7 @@ Executable git-annex
    time (>= 1.5.0),
    old-locale,
    persistent-sqlite (>= 2.8.1),
@ -132,6 +132,26 @@ index 31e66f9f27..7bf1a8ae0c 100644
    unliftio-core,
    microlens,
    aeson,
-- 
-2.42.0
-
+Index: git-annex-10.20240927/Database/RepoSize.hs
+===================================================================
+--- git-annex-10.20240927.orig/Database/RepoSize.hs	2024-09-30 23:15:57.000000000 +0000
+++ git-annex-10.20240927/Database/RepoSize.hs	2024-10-26 13:37:26.311088729 +0000
+@@ -5,7 +5,6 @@
+  - Licensed under the GNU AGPL version 3 or higher.
+  -}
+ 
+-{-# LANGUAGE CPP #-}
+ {-# LANGUAGE QuasiQuotes, TypeFamilies, TemplateHaskell #-}
+ {-# LANGUAGE OverloadedStrings, GADTs, FlexibleContexts #-}
+ {-# LANGUAGE MultiParamTypeClasses, GeneralizedNewtypeDeriving #-}
+@@ -13,10 +12,8 @@
+ {-# LANGUAGE RankNTypes #-}
+ {-# LANGUAGE UndecidableInstances #-}
+ {-# LANGUAGE TypeOperators #-}
+-#if MIN_VERSION_persistent_template(2,8,0)
+ {-# LANGUAGE DerivingStrategies #-}
+ {-# LANGUAGE StandaloneDeriving #-}
+-#endif
+ 
+ module Database.RepoSize (
+ 	RepoSizeHandle,
--- a/git-annex-10.20240808.tar.gz
+++ b/git-annex-10.20240808.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e96e06db663953c0160ebf734e84775e9fc24af0b9771f3c1a61caabaf14e885
-size 9417070
--- a/git-annex-10.20240927.tar.gz
+++ b/git-annex-10.20240927.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:71f5615411c9695953b9b1129e84dffee1e81e32ea6b8a8d9d383bd08c67a22f
+size 9491594
--- a/git-annex.changes
+++ b/git-annex.changes
@ -1,3 +1,59 @@
+-------------------------------------------------------------------
+Mon Sep 30 23:17:41 UTC 2024 - Peter Simons <psimons@suse.com>
+
+- Update git-annex to version 10.20240927.
+  git-annex (10.20240927) upstream; urgency=medium
+
+    * Detect when a preferred content expression contains "not present",
+      which would lead to repeatedly getting and then dropping files,
+      and make it never match. This also applies to
+      "not balanced" and "not sizebalanced".
+    * Fix --explain display of onlyingroup preferred content expression.
+    * Allow maxsize to be set to 0 to stop checking maxsize for a repository.
+    * Fix bug that prevented anything being stored in an empty
+      repository whose preferred content expression uses sizebalanced.
+    * sim: New command, can be used to simulate networks of repositories
+      and see how preferred content and other configuration makes file
+      content flow through it.
+
+   -- Joey Hess <id@joeyh.name>  Mon, 30 Sep 2024 19:15:35 -0400
+
+-------------------------------------------------------------------
+Sat Aug 31 23:51:02 UTC 2024 - Peter Simons <psimons@suse.com>
+
+- Update git-annex to version 10.20240831.
+  git-annex (10.20240831) upstream; urgency=medium
+
+    * Special remotes configured with exporttree=yes annexobjects=yes
+      can store objects in .git/annex/objects, as well as an exported tree.
+    * Support proxying to special remotes configured with
+      exporttree=yes annexobjects=yes, and allow such remotes to be used as
+      cluster nodes.
+    * post-retrieve: When proxying is enabled for an exporttree=yes
+      special remote (or it is a cluster node) and the configured
+      remote.name.annex-tracking-branch is received, the tree is
+      exported to the special remote.
+    * Support "balanced=", "fullybalanced=", "sizebalanced=" and
+      "fullysizebalanced=" in preferred content expressions.
+    * Added --rebalance option.
+    * Added the annex.fullybalancedthreshhold git config.
+    * maxsize: New command to tell git-annex how large the expected maximum
+      size of a repository is, and to display repository sizes.
+    * vicfg: Include maxsize configuration.
+    * info: Improved speed by using new repository size tracking.
+    * lookupkey: Allow using --ref in a bare repository.
+    * export: Added --from option.
+    * git-remote-annex: Store objects in exportree=yes special remotes
+      in the same paths used by annexobjects=yes. This is a backwards
+      compatible change.
+    * updateproxy, updatecluster: Prevent using an exporttree=yes special
+      remote that does not have annexobjects=yes, since it will not work.
+    * The config versioning=true is now reserved for use by versioned special
+      remotes. External special remotes should not use that config for their
+      own purposes.
+
+   -- Joey Hess <id@joeyh.name>  Sat, 31 Aug 2024 19:48:17 -0400
+
 -------------------------------------------------------------------
 Thu Aug  8 19:27:29 UTC 2024 - Peter Simons <psimons@suse.com>

--- a/git-annex.spec
+++ b/git-annex.spec
@ -17,7 +17,7 @@


 Name:           git-annex
-Version:        10.20240808
+Version:        10.20240927
 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
@ -69,8 +69,6 @@ BuildRequires:  ghc-conduit-devel
 BuildRequires:  ghc-conduit-prof
 BuildRequires:  ghc-containers-devel
 BuildRequires:  ghc-containers-prof
-BuildRequires:  ghc-criterion-devel
-BuildRequires:  ghc-criterion-prof
 BuildRequires:  ghc-crypto-api-devel
 BuildRequires:  ghc-crypto-api-prof
 BuildRequires:  ghc-crypton-devel
@ -162,6 +160,14 @@ BuildRequires:  ghc-sandi-devel
 BuildRequires:  ghc-sandi-prof
 BuildRequires:  ghc-securemem-devel
 BuildRequires:  ghc-securemem-prof
+BuildRequires:  ghc-servant-client-core-devel
+BuildRequires:  ghc-servant-client-core-prof
+BuildRequires:  ghc-servant-client-devel
+BuildRequires:  ghc-servant-client-prof
+BuildRequires:  ghc-servant-devel
+BuildRequires:  ghc-servant-prof
+BuildRequires:  ghc-servant-server-devel
+BuildRequires:  ghc-servant-server-prof
 BuildRequires:  ghc-shakespeare-devel
 BuildRequires:  ghc-shakespeare-prof
 BuildRequires:  ghc-socks-devel
@ -271,7 +277,7 @@ Optional dependency offering bash completion for git-annex
 %autosetup -p1

 %build
-%define cabal_configure_options -ftestsuite
+%define cabal_configure_options -f+assistant -f+crypton -f+dbus -f+magicmime -f+pairing -f+production -f+servant -f+torrentparser -f-benchmark
 %ghc_bin_build

 %check