From e203fe0bb580fbf90523dcba06b6fd7c483fdc8ae95dd44efe95d9f383f8fee8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 11 Aug 2020 13:38:21 +0000 Subject: [PATCH] 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 --- 0001-fix-build-with-dlist-1.0.patch | 42 ----------------------------- git-annex-8.20200720.1.tar.gz | 3 --- git-annex-8.20200810.tar.gz | 3 +++ git-annex.changes | 38 ++++++++++++++++++++++++++ git-annex.spec | 4 +-- 5 files changed, 42 insertions(+), 48 deletions(-) delete mode 100644 0001-fix-build-with-dlist-1.0.patch delete mode 100644 git-annex-8.20200720.1.tar.gz create mode 100644 git-annex-8.20200810.tar.gz diff --git a/0001-fix-build-with-dlist-1.0.patch b/0001-fix-build-with-dlist-1.0.patch deleted file mode 100644 index ee7a26f..0000000 --- a/0001-fix-build-with-dlist-1.0.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 798fdad6608016301f7e74be73dbedeb87596d0b Mon Sep 17 00:00:00 2001 -From: Joey Hess -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 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 - diff --git a/git-annex-8.20200720.1.tar.gz b/git-annex-8.20200720.1.tar.gz deleted file mode 100644 index c00d496..0000000 --- a/git-annex-8.20200720.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1529eff23f5693161591197abd8c45b9d3051cc53e210339b397e6dbd5acc5b2 -size 8254688 diff --git a/git-annex-8.20200810.tar.gz b/git-annex-8.20200810.tar.gz new file mode 100644 index 0000000..3c15a4d --- /dev/null +++ b/git-annex-8.20200810.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2b88eca55b45dbd387490163febf1dc8d4402e4c3e3ef6e3049a56d47c7b94ee +size 8301289 diff --git a/git-annex.changes b/git-annex.changes index adbf445..c285e08 100644 --- a/git-annex.changes +++ b/git-annex.changes @@ -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 + +- 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 diff --git a/git-annex.spec b/git-annex.spec index 9a68efd..bd8c461 100644 --- a/git-annex.spec +++ b/git-annex.spec @@ -17,13 +17,12 @@ Name: git-annex -Version: 8.20200720.1 +Version: 8.20200810 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 URL: https://hackage.haskell.org/package/%{name} 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: chrpath BuildRequires: curl @@ -170,7 +169,6 @@ Optional dependency offering bash completion for git-annex %prep %setup -q -%patch01 -p1 %build %define cabal_configure_options -ftestsuite