From a4742fcf0b221d5c89f0a26f7f33e7341671efc3 Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen@redhat.com>
Date: Tue, 31 Dec 2019 17:07:56 +0800
Subject: [PATCH] drop cabal-rpm-0.13.3-simple-cmd_sudo.patch

---
 cabal-rpm-0.13.3-simple-cmd_sudo.patch | 20 --------------------
 cabal-rpm.spec                         |  4 ----
 2 files changed, 24 deletions(-)
 delete mode 100644 cabal-rpm-0.13.3-simple-cmd_sudo.patch

diff --git a/cabal-rpm-0.13.3-simple-cmd_sudo.patch b/cabal-rpm-0.13.3-simple-cmd_sudo.patch
deleted file mode 100644
index 04420cd..0000000
--- a/cabal-rpm-0.13.3-simple-cmd_sudo.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- cabal-rpm-0.13.3/src/PackageUtils.hs~	2019-05-11 15:22:29.000000000 +0800
-+++ cabal-rpm-0.13.3/src/PackageUtils.hs	2019-09-04 18:30:50.875375095 +0800
-@@ -42,7 +42,7 @@
- import FileUtils (filesWithExtension, fileWithExtension,
-                   getDirectoryContents_, mktempdir, withTempDirectory)
- import Options (RpmFlags (..))
--import SimpleCmd (cmd, cmd_, cmdIgnoreErr, cmdLines, grep_, sudo,
-+import SimpleCmd (cmd, cmd_, cmdIgnoreErr, cmdLines, grep_, sudo_,
-                   (+-+))
- import SimpleCmd.Git (isGitDir, grepGitConfig)
- import SysCmd (die, optionalProgram, requireProgram, rpmEval)
-@@ -576,7 +576,7 @@
-   pkginstaller <- packageManager
-   let (inst, arg) = if pkginstaller == "dnf" then ("dnf", "install") else ("yum", "localinstall")
-   tty <- hIsTerminalDevice stdout
--  sudo inst $ ["-y" | not tty] ++ [arg] ++ rpms
-+  sudo_ inst $ ["-y" | not tty] ++ [arg] ++ rpms
- 
- editSpecField :: String -> String -> FilePath -> IO ()
- editSpecField field new spec =
diff --git a/cabal-rpm.spec b/cabal-rpm.spec
index f73803d..dbafaa2 100644
--- a/cabal-rpm.spec
+++ b/cabal-rpm.spec
@@ -20,7 +20,6 @@ Url:            https://hackage.haskell.org/package/%{name}
 Source0:        https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz
 # End cabal-rpm sources
 Source1:        cblrpm.1
-Patch1:         cabal-rpm-0.13.3-simple-cmd_sudo.patch
 
 # Begin cabal-rpm deps:
 BuildRequires:  ghc-rpm-macros
@@ -81,9 +80,6 @@ Standalone packages can also be packaged built with cabal-install.
 # Begin cabal-rpm setup:
 %setup -q
 # End cabal-rpm setup
-%if 0%{?fedora} < 31
-%patch1 -p1 -b .orig
-%endif
 
 
 %build