From 927985934cb3e517151bca8e12d539679fccc644820a2cbb3201c0ea09589594 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Nov 2020 02:01:53 +0000 Subject: [PATCH] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:git-annex revision:38, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/git-annex?expand=0&rev=17 --- ...s-needed-by-new-version-of-persisten.patch | 66 +++++++++++++++++++ git-annex-8.20201007.tar.gz | 3 - git-annex-8.20201103.tar.gz | 3 + git-annex.changes | 14 ++++ git-annex.spec | 5 +- 5 files changed, 86 insertions(+), 5 deletions(-) create mode 100644 0001-enable-extensions-needed-by-new-version-of-persisten.patch delete mode 100644 git-annex-8.20201007.tar.gz create mode 100644 git-annex-8.20201103.tar.gz diff --git a/0001-enable-extensions-needed-by-new-version-of-persisten.patch b/0001-enable-extensions-needed-by-new-version-of-persisten.patch new file mode 100644 index 0000000..f3f9fa8 --- /dev/null +++ b/0001-enable-extensions-needed-by-new-version-of-persisten.patch @@ -0,0 +1,66 @@ +From 028d4517c7cf9e0f031aa71db15924c09be36cf5 Mon Sep 17 00:00:00 2001 +From: Joey Hess +Date: Sat, 7 Nov 2020 14:09:17 -0400 +Subject: [PATCH] enable extensions needed by new version of persistent + +Needed in order to use mkPersist in +persistent version 2.11.0.1 +persistent-template version 2.9.1.0 +--- + Database/ContentIdentifier.hs | 1 + + Database/Export.hs | 1 + + Database/Fsck.hs | 1 + + Database/Keys/SQL.hs | 1 + + 4 files changed, 4 insertions(+) + +diff --git a/Database/ContentIdentifier.hs b/Database/ContentIdentifier.hs +index 0508a386e..da7f9545d 100644 +--- a/Database/ContentIdentifier.hs ++++ b/Database/ContentIdentifier.hs +@@ -10,6 +10,7 @@ + {-# LANGUAGE OverloadedStrings, GADTs, FlexibleContexts, EmptyDataDecls #-} + {-# LANGUAGE MultiParamTypeClasses, GeneralizedNewtypeDeriving #-} + {-# LANGUAGE RankNTypes #-} ++{-# LANGUAGE DataKinds, FlexibleInstances #-} + {-# LANGUAGE UndecidableInstances #-} + #if MIN_VERSION_persistent_template(2,8,0) + {-# LANGUAGE DerivingStrategies #-} +diff --git a/Database/Export.hs b/Database/Export.hs +index 1eba4dd40..99a481703 100644 +--- a/Database/Export.hs ++++ b/Database/Export.hs +@@ -10,6 +10,7 @@ + {-# LANGUAGE OverloadedStrings, GADTs, FlexibleContexts #-} + {-# LANGUAGE MultiParamTypeClasses, GeneralizedNewtypeDeriving #-} + {-# LANGUAGE RankNTypes #-} ++{-# LANGUAGE DataKinds, FlexibleInstances #-} + {-# LANGUAGE UndecidableInstances #-} + #if MIN_VERSION_persistent_template(2,8,0) + {-# LANGUAGE DerivingStrategies #-} +diff --git a/Database/Fsck.hs b/Database/Fsck.hs +index 528f3a007..c1e984197 100644 +--- a/Database/Fsck.hs ++++ b/Database/Fsck.hs +@@ -9,6 +9,7 @@ + {-# LANGUAGE QuasiQuotes, TypeFamilies, TemplateHaskell #-} + {-# LANGUAGE OverloadedStrings, GADTs, FlexibleContexts #-} + {-# LANGUAGE MultiParamTypeClasses, GeneralizedNewtypeDeriving #-} ++{-# LANGUAGE DataKinds, FlexibleInstances #-} + {-# LANGUAGE RankNTypes #-} + {-# LANGUAGE UndecidableInstances #-} + #if MIN_VERSION_persistent_template(2,8,0) +diff --git a/Database/Keys/SQL.hs b/Database/Keys/SQL.hs +index f96433b36..26108b196 100644 +--- a/Database/Keys/SQL.hs ++++ b/Database/Keys/SQL.hs +@@ -10,6 +10,7 @@ + {-# LANGUAGE OverloadedStrings, GADTs, FlexibleContexts #-} + {-# LANGUAGE MultiParamTypeClasses, GeneralizedNewtypeDeriving #-} + {-# LANGUAGE RankNTypes, ScopedTypeVariables #-} ++{-# LANGUAGE DataKinds, FlexibleInstances #-} + {-# LANGUAGE UndecidableInstances #-} + #if MIN_VERSION_persistent_template(2,8,0) + {-# LANGUAGE DerivingStrategies #-} +-- +2.28.0.297.g1956fa8f8d + diff --git a/git-annex-8.20201007.tar.gz b/git-annex-8.20201007.tar.gz deleted file mode 100644 index ddd57bd..0000000 --- a/git-annex-8.20201007.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9908fab98e99ee256ec8c95056ddc4130bf4badf9da6f86abf7d56e52b31b701 -size 8387121 diff --git a/git-annex-8.20201103.tar.gz b/git-annex-8.20201103.tar.gz new file mode 100644 index 0000000..10ba92f --- /dev/null +++ b/git-annex-8.20201103.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:05e7ab12209fcb48e62f1cd2fde4c91d3295375e4d1dee919b18f8a183653e1d +size 8429578 diff --git a/git-annex.changes b/git-annex.changes index 4b642e4..86db617 100644 --- a/git-annex.changes +++ b/git-annex.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Sat Nov 7 22:15:09 UTC 2020 - Ondřej Súkup + +- add ./0001-enable-extensions-needed-by-new-version-of-persisten.patch + +------------------------------------------------------------------- +Sat Nov 7 15:34:35 UTC 2020 - psimons@suse.com + +- Update git-annex to version 8.20201103. + 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-8.20201103/src/CHANGELOG + ------------------------------------------------------------------- Thu Oct 8 02:00:42 UTC 2020 - psimons@suse.com diff --git a/git-annex.spec b/git-annex.spec index 64a5aac..9dd8c0f 100644 --- a/git-annex.spec +++ b/git-annex.spec @@ -17,12 +17,13 @@ Name: git-annex -Version: 8.20201007 +Version: 8.20201103 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 +Patch0: 0001-enable-extensions-needed-by-new-version-of-persisten.patch BuildRequires: bash-completion BuildRequires: chrpath BuildRequires: curl @@ -168,7 +169,7 @@ Supplements: (%{name} and bash-completion) Optional dependency offering bash completion for git-annex %prep -%autosetup +%autosetup -p1 %build %define cabal_configure_options -ftestsuite