diff --git a/ghc-zlib.changes b/ghc-zlib.changes index 7f8982a..bd7317b 100644 --- a/ghc-zlib.changes +++ b/ghc-zlib.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed May 4 00:39:44 UTC 2022 - Peter Simons + +- Update zlib to version 0.6.3.0. + Upstream has edited the change log file since the last release in + a non-trivial way, i.e. they did more than just add a new entry + at the top. You can review the file at: + http://hackage.haskell.org/package/zlib-0.6.3.0/src/changelog + ------------------------------------------------------------------- Tue Sep 7 08:16:24 UTC 2021 - psimons@suse.com diff --git a/ghc-zlib.spec b/ghc-zlib.spec index 1aa4f2e..f2b2f36 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-zlib # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,13 +19,12 @@ %global pkg_name zlib %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.6.2.3 +Version: 0.6.3.0 Release: 0 Summary: Compression and decompression in the gzip and zlib formats License: BSD-2-Clause URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz -Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal#/%{pkg_name}.cabal BuildRequires: ghc-Cabal-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-rpm-macros @@ -34,7 +33,6 @@ ExcludeArch: %{ix86} %if %{with tests} BuildRequires: ghc-QuickCheck-devel BuildRequires: ghc-tasty-devel -BuildRequires: ghc-tasty-hunit-devel BuildRequires: ghc-tasty-quickcheck-devel %endif @@ -61,7 +59,6 @@ This package provides the Haskell %{pkg_name} library development files. %prep %autosetup -n %{pkg_name}-%{version} -cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build @@ -82,6 +79,6 @@ cp -p %{SOURCE1} %{pkg_name}.cabal %license LICENSE %files devel -f %{name}-devel.files -%doc changelog examples +%doc README.md changelog examples %changelog diff --git a/zlib-0.6.2.3.tar.gz b/zlib-0.6.2.3.tar.gz deleted file mode 100644 index 7998b56..0000000 --- a/zlib-0.6.2.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:807f6bddf9cb3c517ce5757d991dde3c7e319953a22c86ee03d74534bd5abc88 -size 149186 diff --git a/zlib-0.6.3.0.tar.gz b/zlib-0.6.3.0.tar.gz new file mode 100644 index 0000000..ef99fd5 --- /dev/null +++ b/zlib-0.6.3.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9eaa989ad4534438b5beb51c1d3a4c8f6a088fdff0b259a5394fbf39aaee04da +size 369595 diff --git a/zlib.cabal b/zlib.cabal deleted file mode 100644 index eef4f1c..0000000 --- a/zlib.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