From 5032ed775f2aec0ab0ee1d3c5504467bab72346b Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen@redhat.com>
Date: Jul 18 2023 09:28:19 +0000
Subject: remove obsolete patch for sdist file perms


---

diff --git a/442869918260a7bb3f0cb0698eaeaeb6dae2c4f6.patch b/442869918260a7bb3f0cb0698eaeaeb6dae2c4f6.patch
deleted file mode 100644
index 0c4e6af..0000000
--- a/442869918260a7bb3f0cb0698eaeaeb6dae2c4f6.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-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/src/Distribution/Client/CmdSdist.hs
-+++ b/cabal-install/stc/Distribution/Client/CmdSdist.hs
-@@ -75,7 +75,8 @@ import Data.List
- import qualified Data.Set as Set
- import System.Directory
-     ( getCurrentDirectory, setCurrentDirectory
--    , createDirectoryIfMissing, makeAbsolute )
-+    , createDirectoryIfMissing, makeAbsolute
-+    , getPermissions, executable )
- import System.FilePath
-     ( (</>), (<.>), makeRelative, normalise, takeDirectory )
- 
-@@ -281,10 +282,11 @@ packageToSdist verbosity projectRootDir format outputFile pkg = do
-                             Right path -> tell [Tar.directoryEntry path]
- 
-                         for_ files $ \(perm, file) -> do
-+                            realPerm <- liftIO $ getPermissions file
-                             let fileDir = takeDirectory (prefix </> file)
-                                 perm' = case perm of
--                                    Exec -> Tar.executableFilePermissions
--                                    NoExec -> Tar.ordinaryFilePermissions
-+                                    Exec | executable realPerm -> Tar.executableFilePermissions
-+                                    _                          -> Tar.ordinaryFilePermissions
-                             needsEntry <- gets (Set.notMember fileDir)
- 
-                             when needsEntry $ do
diff --git a/cabal-install.spec b/cabal-install.spec
index 94c8063..fa8991e 100644
--- a/cabal-install.spec
+++ b/cabal-install.spec
@@ -13,8 +13,6 @@ Source0:        https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%
 Source1:        https://hackage.haskell.org/package/%{name}-%{version}/%{name}.cabal#/%{name}-%{version}.cabal
 # End cabal-rpm sources
 Source10:       cabal-install.sh
-# backport sdist fix from https://github.com/haskell/cabal/issues/5813
-#Patch0:         https://github.com/haskell/cabal/commit/442869918260a7bb3f0cb0698eaeaeb6dae2c4f6.patch
 
 # Begin cabal-rpm deps:
 BuildRequires:  dos2unix
@@ -78,7 +76,6 @@ installation of Haskell libraries and programs.
 %setup -q
 dos2unix -k -n %{SOURCE1} %{name}.cabal
 # End cabal-rpm setup
-#%%patch0 -p2 -b .sdist
 
 
 %build