osc copypac from project:devel:languages:haskell:ghc-8.10.x package:git-annex revision:29, using keep-link

OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/git-annex?expand=0&rev=6
This commit is contained in:
Peter Simons 2020-08-11 13:38:21 +00:00 committed by Git OBS Bridge
parent 4361e532a4
commit e203fe0bb5
5 changed files with 42 additions and 48 deletions

View File

@ -1,42 +0,0 @@
From 798fdad6608016301f7e74be73dbedeb87596d0b Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Tue, 21 Jul 2020 12:58:51 -0400
Subject: [PATCH] fix build with dlist-1.0
That removed the list function. This new implementation appears to
actually be more efficient anyway, since it avoids toList.
---
CHANGELOG | 6 ++++++
Utility/TList.hs | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG b/CHANGELOG
index ff72a9895..edbb3195f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+git-annex (8.20200720.2) UNRELEASED; urgency=medium
+
+ * Support building with dlist-1.0
+
+ -- Joey Hess <id@joeyh.name> Tue, 21 Jul 2020 12:58:30 -0400
+
git-annex (8.20200720.1) upstream; urgency=medium
* Fix a bug in find --batch in the previous version.
diff --git a/Utility/TList.hs b/Utility/TList.hs
index 08def4890..2168a1c4a 100644
--- a/Utility/TList.hs
+++ b/Utility/TList.hs
@@ -86,7 +86,7 @@ modifyTList tlist a = do
putTMVar tlist dl'
emptyDList :: D.DList a -> Bool
-emptyDList = D.list True (\_ _ -> False)
+emptyDList = null . D.toList
consTList :: TList a -> a -> STM ()
consTList tlist v = modifyTList tlist $ \dl -> D.cons v dl
--
2.26.2

View File

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

View File

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

View File

@ -1,3 +1,41 @@
-------------------------------------------------------------------
Tue Aug 11 02:00:33 UTC 2020 - psimons@suse.com
- Update git-annex to version 8.20200810.
git-annex (8.20200810) upstream; urgency=medium
* Added support for external backend programs. So if you want a hash
that git-annex doesn't support, or something stranger, you can write a
small program to implement it.
* Fix a bug in find --branch in the previous version.
* importfeed: Fix reversion that caused some '.' in filenames to be
replaced with '_'
* Fix a lock file descriptor leak that could occur when running commands
like git-annex add with -J. Bug was introduced as part of a different FD
leak fix in version 6.20160318.
* Fix a hang when using git-annex with an old openssh 7.2p2, which had
some weird inheriting of ssh FDs by sshd. Bug was introduced in
git-annex version 7.20200202.7.
* move, copy --to: Sped up seeking files by 2x.
* drop: Sped up seeking files to drop by 2x, and also some performance
improvements to checking numcopies.
* Deal with unusual IFS settings in the shell scripts for linux
standalone and OSX app.
Thanks, Yaroslav Halchenko
* Avoid complaining that a file with "is beyond a symbolic link"
when the filepath is absolute and the symlink in question is not
actually inside the git repository.
* Slightly sped up the linux standalone bundle.
* Support building with dlist-1.0
- Drop obsolete 0001-fix-build-with-dlist-1.0.patch.
-------------------------------------------------------------------
Thu Aug 6 07:58:47 UTC 2020 - Peter Simons <psimons@suse.com>
- Apply 0001-fix-build-with-dlist-1.0.patch to add support for
building with dlist version 1.x.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jul 21 08:29:13 UTC 2020 - psimons@suse.com Tue Jul 21 08:29:13 UTC 2020 - psimons@suse.com

View File

@ -17,13 +17,12 @@
Name: git-annex Name: git-annex
Version: 8.20200720.1 Version: 8.20200810
Release: 0 Release: 0
Summary: Manage files with git, without checking their contents into git 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 License: AGPL-3.0-or-later AND GPL-3.0-or-later AND BSD-2-Clause AND MIT AND GPL-2.0-only
URL: https://hackage.haskell.org/package/%{name} URL: https://hackage.haskell.org/package/%{name}
Source0: https://github.com/peti/git-annex/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz Source0: https://github.com/peti/git-annex/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
Patch01: 0001-fix-build-with-dlist-1.0.patch
BuildRequires: bash-completion BuildRequires: bash-completion
BuildRequires: chrpath BuildRequires: chrpath
BuildRequires: curl BuildRequires: curl
@ -170,7 +169,6 @@ Optional dependency offering bash completion for git-annex
%prep %prep
%setup -q %setup -q
%patch01 -p1
%build %build
%define cabal_configure_options -ftestsuite %define cabal_configure_options -ftestsuite