update to 3.2.0.0

.gitignore

@@ -21,3 +21,4 @@ cabal-install-0.8.2.tar.gz
 /cabal-install-2.4.0.0.tar.gz
 /cabal-install-2.4.1.0.tar.gz
 /cabal-install-3.0.0.0.tar.gz
+/cabal-install-3.2.0.0.tar.gz

442869918260a7bb3f0cb0698eaeaeb6dae2c4f6.patch

@@ -1,6 +1,18 @@
---- cabal-install-2.4.1.0/Distribution/Client/CmdSdist.hs.orig	1970-01-01 07:30:00.000000000 +0730
-+++ cabal-install-2.4.1.0/Distribution/Client/CmdSdist.hs	2020-04-14 13:08:58.730089942 +0800
-@@ -84,7 +84,8 @@
+From 442869918260a7bb3f0cb0698eaeaeb6dae2c4f6 Mon Sep 17 00:00:00 2001
+From: Alexis Williams <alexis@typedr.at>
+Date: Sat, 21 Dec 2019 09:50:12 -0800
+Subject: [PATCH] Fix `v2-sdist` permissions
+
+Fixes #5813.
+---
+ cabal-install/Distribution/Client/CmdSdist.hs | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/cabal-install/Distribution/Client/CmdSdist.hs b/cabal-install/Distribution/Client/CmdSdist.hs
+index 55d01ad24a..218da6b720 100644
+--- a/cabal-install/Distribution/Client/CmdSdist.hs
++++ b/cabal-install/Distribution/Client/CmdSdist.hs
+@@ -75,7 +75,8 @@ import Data.List
  import qualified Data.Set as Set
  import System.Directory
      ( getCurrentDirectory, setCurrentDirectory
@@ -9,12 +21,12 @@
 +    , getPermissions, executable )
  import System.FilePath
      ( (</>), (<.>), makeRelative, normalise, takeDirectory )
-
-@@ -269,10 +270,11 @@
+ 
+@@ -281,10 +282,11 @@ packageToSdist verbosity projectRootDir format outputFile pkg = do
                              Right path -> tell [Tar.directoryEntry path]
-
-                         forM_ files $ \(perm, file) -> do
-+                            realPerm <- liftIO $ getPermissions file
+ 
+                         for_ files $ \(perm, file) -> do
++                            realPerm <- getPermissions file
                              let fileDir = takeDirectory (prefix </> file)
                                  perm' = case perm of
 -                                    Exec -> Tar.executableFilePermissions
@@ -22,5 +34,5 @@
 +                                    Exec | executable realPerm -> Tar.executableFilePermissions
 +                                    _                          -> Tar.ordinaryFilePermissions
                              needsEntry <- gets (Set.notMember fileDir)
-
+ 
                              when needsEntry $ do

cabal-install.spec

@@ -1,9 +1,9 @@
-# generated by cabal-rpm-2.0.6
+# generated by cabal-rpm-2.0.9
 # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/
 
 Name:           cabal-install
-Version:        3.0.0.0
-Release:        5%{?dist}
+Version:        3.2.0.0
+Release:        1%{?dist}
 Summary:        The command-line interface for Cabal and Hackage
 
 License:        BSD
@@ -13,7 +13,7 @@ Source0:        https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%
 # End cabal-rpm sources
 Source10:       cabal-install.sh
 # backport fix from https://github.com/haskell/cabal/issues/5813
-Patch0:         cabal-install-sdist-file-permissions.patch
+Patch0:         https://github.com/haskell/cabal/commit/442869918260a7bb3f0cb0698eaeaeb6dae2c4f6.patch
 # upstream patch copied from Debian
 Patch1:         cabal-install-hackage-security-0.6.patch
 
@@ -36,6 +36,7 @@ BuildRequires:  ghc-edit-distance-static
 BuildRequires:  ghc-filepath-static
 BuildRequires:  ghc-hackage-security-static
 BuildRequires:  ghc-hashable-static
+BuildRequires:  ghc-lukko-static
 BuildRequires:  ghc-mtl-static
 BuildRequires:  ghc-network-static
 BuildRequires:  ghc-network-uri-static
@@ -48,6 +49,7 @@ BuildRequires:  ghc-stm-static
 BuildRequires:  ghc-tar-static
 BuildRequires:  ghc-text-static
 BuildRequires:  ghc-time-static
+BuildRequires:  ghc-transformers-static
 BuildRequires:  ghc-unix-static
 BuildRequires:  ghc-zlib-static
 # End cabal-rpm deps
@@ -74,10 +76,10 @@ installation of Haskell libraries and programs.
 %prep
 # Begin cabal-rpm setup:
 %setup -q
-chmod a-x README.md changelog
 # End cabal-rpm setup
-%patch0 -p1 -b .orig
-%patch1 -p1 -b .orig
+%patch0 -p2 -b .orig
+#%%patch1 -p1 -b .orig
+cabal-tweak-dep-ver base '< 4.14' '< 4.15'
 
 
 %build
@@ -108,6 +110,9 @@ install -pm 644 -D -t %{buildroot}%{_sysconfdir}/profile.d/ %{SOURCE10}
 
 
 %changelog
+* Thu Aug  5 2021 Jens Petersen <petersen@redhat.com> - 3.2.0.0-1
+- update to 3.2.0.0
+
 * Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.0.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (cabal-install-3.0.0.0.tar.gz) = 0b15313fc11bc6b6018e01b6a3a65242306977c16ce9333ea1191c1ce0020b180451235a7a65b47bc01791e05d1b246bf9d573fc7e981a46fcfc7da0fed04cca
+SHA512 (cabal-install-3.2.0.0.tar.gz) = ad937b2df42b688e4608aa2b91a25daf1042e5573626202e5182cbfeca9acc5933194853405a6396c60d0d28d6d0d5c5276fd85cb6acf4be2c8cd12afe747062