From d498ec8ce2fc68d7efa33c8bf25f4de54395ee6e Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 23 Jan 2023 01:56:12 +0800 Subject: [PATCH] https://hackage.haskell.org/package/zlib-0.6.3.0/changelog --- .gitignore | 1 + ghc-zlib.spec | 8 +-- sources | 2 +- zlib-0.6.2.3.cabal | 135 --------------------------------------------- 4 files changed, 4 insertions(+), 142 deletions(-) delete mode 100644 zlib-0.6.2.3.cabal diff --git a/.gitignore b/.gitignore index 83758cd..79a3a56 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /zlib-0.6.2.1.tar.gz /zlib-0.6.2.2.tar.gz /zlib-0.6.2.3.tar.gz +/zlib-0.6.3.0.tar.gz diff --git a/ghc-zlib.spec b/ghc-zlib.spec index 5579cf1..be3ea5f 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -7,7 +7,7 @@ %bcond_without tests Name: ghc-%{pkg_name} -Version: 0.6.2.3 +Version: 0.6.3.0 Release: %autorelease Summary: Compression and decompression in the gzip and zlib formats @@ -16,13 +16,11 @@ License: BSD-2-Clause Url: https://hackage.haskell.org/package/%{pkg_name} # Begin cabal-rpm sources: Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz -Source1: https://hackage.haskell.org/package/%{pkgver}/%{pkg_name}.cabal#/%{pkgver}.cabal # 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: dos2unix BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-base-devel @@ -35,7 +33,6 @@ BuildRequires: zlib-devel %if %{with tests} BuildRequires: ghc-QuickCheck-devel BuildRequires: ghc-tasty-devel -BuildRequires: ghc-tasty-hunit-devel BuildRequires: ghc-tasty-quickcheck-devel %endif # End cabal-rpm deps @@ -92,7 +89,6 @@ This package provides the Haskell %{pkg_name} profiling library. %prep # Begin cabal-rpm setup: %setup -q -n %{pkgver} -dos2unix -k -n %{SOURCE1} %{pkg_name}.cabal # End cabal-rpm setup %ifarch s390x %patch0 -p1 -b.orig @@ -126,7 +122,7 @@ rm -r cbits %files devel -f %{name}-devel.files -%doc changelog examples +%doc README.md changelog examples %if %{with haddock} diff --git a/sources b/sources index b9ac62f..16a1864 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zlib-0.6.2.3.tar.gz) = 535fc711af639967c032791c6a0c09680ac186c706e02a28cfabd9b2dcddc84a6ee5f6007e2ed67c1dc19dd6d561cb821d8840dba7386b63cc002418c4d5040a +SHA512 (zlib-0.6.3.0.tar.gz) = 95daae13c5d5458fd7c610ce4cc686dc7af477364c4dcf3d31abede84f6e4b4e70ea255f7ded586d46d9bb6298d19c93b8856eec16c6002265ed076e52bf9a21 diff --git a/zlib-0.6.2.3.cabal b/zlib-0.6.2.3.cabal deleted file mode 100644 index a63035d..0000000 --- a/zlib-0.6.2.3.cabal +++ /dev/null @@ -1,135 +0,0 @@ -cabal-version: >= 1.10 -name: zlib -version: 0.6.2.3 -x-revision: 1 - -copyright: (c) 2006-2016 Duncan Coutts -license: BSD3 -license-file: LICENSE -author: Duncan Coutts -maintainer: Duncan Coutts , Andrew Lelechenko , Emily Pillmore , Herbert Valerio Riedel -bug-reports: https://github.com/haskell/zlib/issues -category: Codec -synopsis: Compression and decompression in the gzip and zlib formats -description: This package provides a pure interface for compressing and - decompressing streams of data represented as lazy - 'ByteString's. It uses the - - so it has high performance. It supports the \"zlib\", - \"gzip\" and \"raw\" compression formats. - . - It provides a convenient high level API suitable for most - tasks and for the few cases where more control is needed it - provides access to the full zlib feature set. -build-type: Simple - -tested-with: GHC == 7.0.4 - , GHC == 7.2.2 - , GHC == 7.4.2 - , GHC == 7.6.3 - , GHC == 7.8.4 - , GHC == 7.10.3 - , GHC == 8.0.2 - , GHC == 8.2.2 - , GHC == 8.4.4 - , GHC == 8.6.5 - , GHC == 8.8.4 - , GHC == 8.10.3 - -extra-source-files: changelog - -- zlib C sources (for Windows) - cbits/crc32.h cbits/inffast.h cbits/inflate.h - cbits/trees.h cbits/deflate.h cbits/inffixed.h - cbits/inftrees.h cbits/zutil.h cbits/gzguts.h - -- test data files - test/data/bad-crc.gz test/data/custom-dict.zlib - test/data/custom-dict.zlib-dict test/data/hello.gz - test/data/not-gzip test/data/two-files.gz - -- demo programs: - examples/gzip.hs examples/gunzip.hs - -source-repository head - type: git - location: https://github.com/haskell/zlib.git - -flag non-blocking-ffi - default: False - manual: True - description: The (de)compression calls can sometimes take a long time, which - prevents other Haskell threads running. Enabling this flag - avoids this unfairness, but with greater overall cost. - -flag pkg-config - default: False - manual: True - description: Use @pkg-config(1)@ to locate foreign @zlib@ library. - -flag bundled-c-zlib - default: False - manual: True - description: Use the bundled zlib C sources. Requires pkg-config to be False. - For windows, this is the default. - - -library - exposed-modules: Codec.Compression.GZip, - Codec.Compression.Zlib, - Codec.Compression.Zlib.Raw, - Codec.Compression.Zlib.Internal - other-modules: Codec.Compression.Zlib.Stream, - Codec.Compression.Zlib.ByteStringCompat - - if impl(ghc < 7) - default-language: Haskell98 - default-extensions: PatternGuards - else - default-language: Haskell2010 - - other-extensions: CPP, ForeignFunctionInterface, RankNTypes, BangPatterns, - DeriveDataTypeable - if impl(ghc >= 7.2) - other-extensions: DeriveGeneric - if impl(ghc >= 7.6) - other-extensions: CApiFFI - - build-depends: base >= 4 && < 4.17, - bytestring >= 0.9 && < 0.12 - if impl(ghc >= 7.0 && < 8.0.3) - build-depends: ghc-prim - - includes: zlib.h - ghc-options: -Wall -fwarn-tabs - if flag(non-blocking-ffi) - cpp-options: -DNON_BLOCKING_FFI - if flag(pkg-config) && !impl(ghcjs) && !os(ghcjs) - -- NB: pkg-config is available on windows as well when using msys2 - pkgconfig-depends: zlib - else - -- don't use pkg-config - if !os(windows) && !flag(bundled-c-zlib) && !impl(ghcjs) && !os(ghcjs) - -- Normally we use the the standard system zlib. - extra-libraries: z - else - -- However for the benefit of users of Windows (which does not have zlib - -- by default) we bundle a complete copy of the C sources of zlib-1.2.11 - c-sources: cbits/adler32.c cbits/compress.c cbits/crc32.c - cbits/deflate.c cbits/infback.c - cbits/inffast.c cbits/inflate.c cbits/inftrees.c - cbits/trees.c cbits/uncompr.c cbits/zutil.c - include-dirs: cbits - install-includes: zlib.h zconf.h - -test-suite tests - type: exitcode-stdio-1.0 - main-is: Test.hs - other-modules: Utils, - Test.Codec.Compression.Zlib.Internal, - Test.Codec.Compression.Zlib.Stream - hs-source-dirs: test - default-language: Haskell2010 - build-depends: base, bytestring, zlib, - QuickCheck == 2.*, - tasty >= 0.8 && < 1.5, - tasty-quickcheck >= 0.8 && < 0.11, - tasty-hunit >= 0.8 && < 0.11 - ghc-options: -Wall