From 65fb45845cccc4ba72078575412eda862e88b9efc4d6966bd36786c2489bdae5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 28 Dec 2019 14:41:01 +0000 Subject: [PATCH] osc copypac from project:devel:languages:haskell:ghc-8.8.x package:ghc-hackage-security revision:10, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-hackage-security?expand=0&rev=48 --- ghc-hackage-security.changes | 79 +----------------------------------- ghc-hackage-security.spec | 3 ++ fix-ghc-8.8.x-build.patch | 12 ++++++ 3 files changed, 17 insertions(+), 77 deletions(-) create mode 100644 fix-ghc-8.8.x-build.patch diff --git a/ghc-hackage-security.changes b/ghc-hackage-security.changes index c5c5131..b297acc 100644 --- a/ghc-hackage-security.changes +++ b/ghc-hackage-security.changes @@ -1,80 +1,5 @@ ------------------------------------------------------------------- -Fri Nov 8 16:13:48 UTC 2019 - Peter Simons +Sat Dec 21 08:07:26 UTC 2019 - psimons@suse.com -- Drop obsolete group attributes. +- Add hackage-security at version 0.5.3.0. -------------------------------------------------------------------- -Tue Jun 11 14:29:11 UTC 2019 - Peter Simons - -- Update Cabal file for more accurate build dependencies. - -------------------------------------------------------------------- -Fri Oct 19 18:38:52 UTC 2018 - Peter Simons - -- Update Cabal build instructions to support ghc-8.6.1. - -------------------------------------------------------------------- -Tue Aug 7 07:10:52 UTC 2018 - psimons@suse.com - -- Update Cabal build information to support Cabal 2.4.x. - -------------------------------------------------------------------- -Wed Jul 18 14:26:25 UTC 2018 - psimons@suse.com - -- Cosmetic: replace tabs with blanks, strip trailing white space, - and update copyright headers with spec-cleaner. - -------------------------------------------------------------------- -Wed Jul 18 14:12:30 UTC 2018 - psimons@suse.com - -- Revise cabal build file to specify more accurate dependencies. - -------------------------------------------------------------------- -Mon May 14 17:02:11 UTC 2018 - psimons@suse.com - -- Update hackage-security to version 0.5.3.0. - * Use `flock(2)`-based locking where available - (compat-shim taken from `cabal-install`'s code-base) (#207) - * Improve handling of async exceptions (#187) - * Detect & recover from local corruption of uncompressed index tarball (#196) - * Support `base-4.11` - -------------------------------------------------------------------- -Thu Aug 3 15:38:38 UTC 2017 - psimons@suse.com - -- Updated with latest spec-cleaner version 0.9.8-8-geadfbbf. - -------------------------------------------------------------------- -Mon May 22 08:08:49 UTC 2017 - psimons@suse.com - -- Update to version 0.5.2.2 revision 4 with cabal2obs. - -------------------------------------------------------------------- -Wed Apr 19 13:20:15 UTC 2017 - psimons@suse.com - -- Update to version 0.5.2.2 revision 3 with cabal2obs. - -------------------------------------------------------------------- -Mon Feb 20 08:42:31 UTC 2017 - psimons@suse.com - -- Update to version 0.5.2.2 revision 2 with cabal2obs. - -------------------------------------------------------------------- -Wed Dec 28 11:40:49 UTC 2016 - psimons@suse.com - -- Update to version 0.5.2.2 revision 1 with cabal2obs. - -------------------------------------------------------------------- -Fri Sep 16 21:16:02 UTC 2016 - psimons@suse.com - -- Update to version 0.5.2.2 with cabal2obs. - -------------------------------------------------------------------- -Sun Jul 10 17:19:31 UTC 2016 - psimons@suse.com - -- Update to version 0.5.2.1 revision 0 with cabal2obs. - -------------------------------------------------------------------- -Fri May 27 12:02:23 UTC 2016 - mimi.vx@gmail.com - -- ghc-hackage-security generated by st2obs scritpt diff --git a/ghc-hackage-security.spec b/ghc-hackage-security.spec index 908aa8d..c0eb85c 100644 --- a/ghc-hackage-security.spec +++ b/ghc-hackage-security.spec @@ -26,6 +26,7 @@ License: BSD-3-Clause URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/6.cabal#/%{pkg_name}.cabal +Patch01: https://raw.githubusercontent.com/hvr/head.hackage/master/patches/hackage-security-0.5.3.0.patch#/fix-ghc-8.8.x-build.patch BuildRequires: ghc-Cabal-devel BuildRequires: ghc-base16-bytestring-devel BuildRequires: ghc-base64-bytestring-devel @@ -85,6 +86,8 @@ files. %prep %setup -q -n %{pkg_name}-%{version} cp -p %{SOURCE1} %{pkg_name}.cabal +%patch01 -p1 +cabal-tweak-dep-ver base '< 4.13' '< 5' %build %ghc_lib_build diff --git a/fix-ghc-8.8.x-build.patch b/fix-ghc-8.8.x-build.patch new file mode 100644 index 0000000..0dfd5e5 --- /dev/null +++ b/fix-ghc-8.8.x-build.patch @@ -0,0 +1,12 @@ +diff -ru hackage-security-0.5.3.0.orig/src/Hackage/Security/TUF/FileMap.hs hackage-security-0.5.3.0/src/Hackage/Security/TUF/FileMap.hs +--- hackage-security-0.5.3.0.orig/src/Hackage/Security/TUF/FileMap.hs 2018-03-25 19:39:07.000000000 -0400 ++++ hackage-security-0.5.3.0/src/Hackage/Security/TUF/FileMap.hs 2019-03-16 08:29:08.347456951 -0400 +@@ -78,7 +78,7 @@ + lookupM :: Monad m => FileMap -> TargetPath -> m FileInfo + lookupM m fp = + case lookup fp m of +- Nothing -> fail $ "No entry for " ++ pretty fp ++ " in filemap" ++ Nothing -> error $ "No entry for " ++ pretty fp ++ " in filemap" + Just nfo -> return nfo + + {-------------------------------------------------------------------------------