Hello community,
here is the log from the commit of package ghc-hackage-security for
openSUSE:Leap:15.2 checked in at 2020-02-19 18:39:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/ghc-hackage-security (Old)
and /work/SRC/openSUSE:Leap:15.2/.ghc-hackage-security.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-hackage-security"
Wed Feb 19 18:39:08 2020 rev:11 rq:771318 version:0.5.3.0
Changes:
--------
---
/work/SRC/openSUSE:Leap:15.2/ghc-hackage-security/ghc-hackage-security.changes
2020-01-15 15:02:04.405799093 +0100
+++
/work/SRC/openSUSE:Leap:15.2/.ghc-hackage-security.new.26092/ghc-hackage-security.changes
2020-02-19 18:39:09.110036091 +0100
@@ -0,0 +1,16 @@
+------------------------------------------------------------------
+Wed Jan 1 11:06:30 UTC 2020 - psim...@suse.com
+
+- Apply "fix-ghc-8.8.x-build.patch" from head.hackage to fix the
+ build with ghc-8.8.1.
+
+-------------------------------------------------------------------
+Fri Nov 8 16:13:48 UTC 2019 - Peter Simons <psim...@suse.com>
+
+- Drop obsolete group attributes.
+
+-------------------------------------------------------------------
+Tue Jun 11 14:29:11 UTC 2019 - Peter Simons <psim...@suse.com>
+
+- Update Cabal file for more accurate build dependencies.
+
New:
----
fix-ghc-8.8.x-build.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-hackage-security.spec ++++++
--- /var/tmp/diff_new_pack.gaI0fM/_old 2020-02-19 18:39:09.526036961 +0100
+++ /var/tmp/diff_new_pack.gaI0fM/_new 2020-02-19 18:39:09.530036969 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ghc-hackage-security
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -23,10 +23,10 @@
Release: 0
Summary: Hackage security library
License: BSD-3-Clause
-Group: Development/Libraries/Haskell
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/3.cabal#/%{pkg_name}.cabal
+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
@@ -74,7 +74,6 @@
%package devel
Summary: Haskell %{pkg_name} library development files
-Group: Development/Libraries/Haskell
Requires: %{name} = %{version}-%{release}
Requires: ghc-compiler = %{ghc_version}
Requires(post): ghc-compiler = %{ghc_version}
@@ -87,6 +86,8 @@
%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
++++++ fix-ghc-8.8.x-build.patch ++++++
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
{-------------------------------------------------------------------------------
++++++ hackage-security.cabal ++++++
--- /var/tmp/diff_new_pack.gaI0fM/_old 2020-02-19 18:39:09.582037078 +0100
+++ /var/tmp/diff_new_pack.gaI0fM/_new 2020-02-19 18:39:09.586037087 +0100
@@ -1,7 +1,7 @@
cabal-version: 1.12
name: hackage-security
version: 0.5.3.0
-x-revision: 3
+x-revision: 6
synopsis: Hackage security library
description: The hackage security library provides both server and
@@ -103,7 +103,7 @@
base16-bytestring >= 0.1.1 && < 0.2,
base64-bytestring >= 1.0 && < 1.1,
bytestring >= 0.9 && < 0.11,
- Cabal >= 1.14 && < 2.6,
+ Cabal >= 1.14 && < 3.2,
containers >= 0.4 && < 0.7,
ed25519 >= 0.0 && < 0.1,
filepath >= 1.2 && < 1.5,
@@ -114,7 +114,7 @@
-- 0.4.2 introduces TarIndex, 0.4.4 introduces more
-- functionality, 0.5.0 changes type of serialise
tar >= 0.5 && < 0.6,
- time >= 1.2 && < 1.9,
+ time >= 1.2 && < 1.10,
transformers >= 0.4 && < 0.6,
zlib >= 0.5 && < 0.7,
-- whatever versions are bundled with ghc:
@@ -201,7 +201,7 @@
-- dependency in network is not redundant.)
if flag(use-network-uri)
build-depends: network-uri >= 2.6 && < 2.7,
- network >= 2.6 && < 2.9
+ network >= 2.6 && < 2.9 || >= 3.0 && < 3.2
else
build-depends: network >= 2.5 && < 2.6
