From 6dcf50607ed57388c9a5794169298dcc05694821 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 17 Feb 2023 10:43:18 +0800 Subject: [PATCH] drop zlib-0.6.2.3-test-rawformat-s390x-z15.patch --- ghc-zlib.spec | 6 +----- zlib-0.6.2.3-test-rawformat-s390x-z15.patch | 11 ----------- 2 files changed, 1 insertion(+), 16 deletions(-) delete mode 100644 zlib-0.6.2.3-test-rawformat-s390x-z15.patch diff --git a/ghc-zlib.spec b/ghc-zlib.spec index be3ea5f..fa65e30 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -17,8 +17,6 @@ Url: https://hackage.haskell.org/package/%{pkg_name} # Begin cabal-rpm sources: Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz # End cabal-rpm sources -# https://github.com/haskell/zlib/issues/46 -Patch0: zlib-0.6.2.3-test-rawformat-s390x-z15.patch # Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel @@ -90,9 +88,7 @@ This package provides the Haskell %{pkg_name} profiling library. # Begin cabal-rpm setup: %setup -q -n %{pkgver} # End cabal-rpm setup -%ifarch s390x -%patch0 -p1 -b.orig -%endif + #remove the copy library rm -r cbits diff --git a/zlib-0.6.2.3-test-rawformat-s390x-z15.patch b/zlib-0.6.2.3-test-rawformat-s390x-z15.patch deleted file mode 100644 index f9da1fb..0000000 --- a/zlib-0.6.2.3-test-rawformat-s390x-z15.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- zlib-0.6.2.3/test/Test.hs~ 2001-09-09 09:46:40.000000000 +0800 -+++ zlib-0.6.2.3/test/Test.hs 2022-03-12 13:04:22.643542774 +0800 -@@ -190,7 +190,7 @@ - let decomp = decompressIO rawFormat defaultDecompressParams - err <- assertDecompressError hnd decomp - msg <- assertDataFormatError err -- msg @?= "invalid code lengths set" -+ msg @?= "Operation-Ending-Supplemental Code is 0x27" - - withSampleData "not-gzip" $ \hnd -> do - let decomp = decompressIO gzipOrZlibFormat defaultDecompressParams