From 66b280422da90bd86e3e3938072445899a2665c034690e260161485ed738ad4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 28 Dec 2019 14:42:30 +0000 Subject: [PATCH 1/4] osc copypac from project:devel:languages:haskell:ghc-8.8.x package:ghc-zlib revision:3, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-zlib?expand=0&rev=48 --- ghc-zlib.changes | 120 ++--------------------------------------------- 1 file changed, 3 insertions(+), 117 deletions(-) diff --git a/ghc-zlib.changes b/ghc-zlib.changes index 56ba718..652dd70 100644 --- a/ghc-zlib.changes +++ b/ghc-zlib.changes @@ -1,10 +1,5 @@ ------------------------------------------------------------------- -Fri Nov 8 16:15:18 UTC 2019 - Peter Simons - -- Drop obsolete group attributes. - -------------------------------------------------------------------- -Tue Aug 27 02:01:52 UTC 2019 - psimons@suse.com +Tue Aug 27 02:01:45 UTC 2019 - psimons@suse.com - Update zlib to version 0.6.2.1. See also http://pvp.haskell.org/faq @@ -14,116 +9,7 @@ Tue Aug 27 02:01:52 UTC 2019 - psimons@suse.com * Add support for GHC 8.8 / base-4.13 ------------------------------------------------------------------- -Sat Oct 20 11:32:17 UTC 2018 - Peter Simons +Tue May 21 15:36:05 UTC 2019 - psimons@suse.com -- Use https URL to refer to bugs.opensuse.org. +- Add zlib at version 0.6.2. -------------------------------------------------------------------- -Wed Jul 18 14:26:49 UTC 2018 - psimons@suse.com - -- Cosmetic: replace tabs with blanks, strip trailing white space, - and update copyright headers with spec-cleaner. - -------------------------------------------------------------------- -Mon May 14 17:02:11 UTC 2018 - psimons@suse.com - -- Update zlib to version 0.6.2. - * New cabal flag 'pkg-config' for discovering 'zlib` via pkg-config(1) (#16) - * Use CApiFFI where available for cross-compile friendliness (#14) - * Change the window bits range from 8..15 to 9..15 (#11) - -------------------------------------------------------------------- -Thu Aug 3 15:38:38 UTC 2017 - psimons@suse.com - -- Updated with latest spec-cleaner version 0.9.8-8-geadfbbf. - -------------------------------------------------------------------- -Sun Oct 30 16:26:14 UTC 2016 - psimons@suse.com - -- Update to version 0.6.1.2 with cabal2obs. - -------------------------------------------------------------------- -Sun Jul 10 17:32:48 UTC 2016 - psimons@suse.com - -- Update to version 0.6.1.1 revision 3 with cabal2obs. - -------------------------------------------------------------------- -Wed Dec 30 11:25:25 UTC 2015 - mimi.vx@gmail.com - -- update to 0.6.1.1 -- regenerated spec file with cabal-rpm -* Support for concatenated gzip files (multiple back-to-back streams) -* Fixed warnings with new GHC -* Fixed testsuite -* New incremental interface for compression and decompression -* Provide access to unconsumed trailing data -* Simplified structured error type, and instance of Exception -* Fixed memory leak of zlib z_stream C structure -* More derivied instances (Eq, Show, Typeable, Generic) - -------------------------------------------------------------------- -Sat Apr 11 09:09:18 UTC 2015 - mimi.vx@gmail.com - -- update to 0.5.4.2 -* no upstreqm changelog - -------------------------------------------------------------------- -Fri Sep 12 06:54:28 UTC 2014 - peter.trommler@ohm-hochschule.de - -- update copyright notice (year) in spec file - -------------------------------------------------------------------- -Sat Aug 23 00:31:27 UTC 2014 - peter.trommler@ohm-hochschule.de - -- enable PowerPC builds - -------------------------------------------------------------------- -Mon May 6 10:45:21 UTC 2013 - peter.trommler@ohm-hochschule.de - -- update to 0.5.4.1 -* no changelog -- part of Haskell Platform 2013.2 update -- more transparent packaging (fewer macros) - -------------------------------------------------------------------- -Thu Dec 27 12:28:22 UTC 2012 - peter.trommler@ohm-hochschule.de - -- fix license tag (intentionally empty 3rd clause) -- expand macro in name tag (help factory-auto) - -------------------------------------------------------------------- -Sat Nov 17 14:58:26 UTC 2012 - peter.trommler@ohm-hochschule.de - -- make service localonly for Factory submission - -------------------------------------------------------------------- -Tue Oct 2 11:21:27 UTC 2012 - peter.trommler@ohm-hochschule.de - -- update to 0.5.4.0 from upstream (no changelog) -- required by Haskell Platform 2012.4.0.0 - -------------------------------------------------------------------- -Mon Jun 4 06:51:40 UTC 2012 - peter.trommler@ohm-hochschule.de - -- update to 0.5.3.3 from upstream (no changelog) -- required by Haskell Platform 2012.2.0.0 - -------------------------------------------------------------------- -Thu Feb 23 13:42:43 UTC 2012 - peter.trommler@ohm-hochschule.de - -- Added BuildRoot for sle11-sp1 - -------------------------------------------------------------------- -Thu Dec 15 09:33:05 UTC 2011 - peter.trommler@ohm-hochschule.de - -- Added requires zlib-devel - -------------------------------------------------------------------- -Thu Dec 15 09:08:25 UTC 2011 - peter.trommler@ohm-hochschule.de - -- Add arches for OBS. - -------------------------------------------------------------------- -Thu Dec 15 09:06:35 UTC 2011 - peter.trommler@ohm-hochschule.de - -- Initial packaging. From affb213c1ae2684ab4635b9c98bdfcfee442d65879ed6ea1ff40257295ad7197 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 29 Dec 2019 02:04:10 +0000 Subject: [PATCH 2/4] osc copypac from project:devel:languages:haskell:ghc-8.6.x package:ghc-zlib revision:7, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-zlib?expand=0&rev=49 --- ghc-zlib.changes | 120 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 117 insertions(+), 3 deletions(-) diff --git a/ghc-zlib.changes b/ghc-zlib.changes index 652dd70..56ba718 100644 --- a/ghc-zlib.changes +++ b/ghc-zlib.changes @@ -1,5 +1,10 @@ ------------------------------------------------------------------- -Tue Aug 27 02:01:45 UTC 2019 - psimons@suse.com +Fri Nov 8 16:15:18 UTC 2019 - Peter Simons + +- Drop obsolete group attributes. + +------------------------------------------------------------------- +Tue Aug 27 02:01:52 UTC 2019 - psimons@suse.com - Update zlib to version 0.6.2.1. See also http://pvp.haskell.org/faq @@ -9,7 +14,116 @@ Tue Aug 27 02:01:45 UTC 2019 - psimons@suse.com * Add support for GHC 8.8 / base-4.13 ------------------------------------------------------------------- -Tue May 21 15:36:05 UTC 2019 - psimons@suse.com +Sat Oct 20 11:32:17 UTC 2018 - Peter Simons -- Add zlib at version 0.6.2. +- Use https URL to refer to bugs.opensuse.org. +------------------------------------------------------------------- +Wed Jul 18 14:26:49 UTC 2018 - psimons@suse.com + +- Cosmetic: replace tabs with blanks, strip trailing white space, + and update copyright headers with spec-cleaner. + +------------------------------------------------------------------- +Mon May 14 17:02:11 UTC 2018 - psimons@suse.com + +- Update zlib to version 0.6.2. + * New cabal flag 'pkg-config' for discovering 'zlib` via pkg-config(1) (#16) + * Use CApiFFI where available for cross-compile friendliness (#14) + * Change the window bits range from 8..15 to 9..15 (#11) + +------------------------------------------------------------------- +Thu Aug 3 15:38:38 UTC 2017 - psimons@suse.com + +- Updated with latest spec-cleaner version 0.9.8-8-geadfbbf. + +------------------------------------------------------------------- +Sun Oct 30 16:26:14 UTC 2016 - psimons@suse.com + +- Update to version 0.6.1.2 with cabal2obs. + +------------------------------------------------------------------- +Sun Jul 10 17:32:48 UTC 2016 - psimons@suse.com + +- Update to version 0.6.1.1 revision 3 with cabal2obs. + +------------------------------------------------------------------- +Wed Dec 30 11:25:25 UTC 2015 - mimi.vx@gmail.com + +- update to 0.6.1.1 +- regenerated spec file with cabal-rpm +* Support for concatenated gzip files (multiple back-to-back streams) +* Fixed warnings with new GHC +* Fixed testsuite +* New incremental interface for compression and decompression +* Provide access to unconsumed trailing data +* Simplified structured error type, and instance of Exception +* Fixed memory leak of zlib z_stream C structure +* More derivied instances (Eq, Show, Typeable, Generic) + +------------------------------------------------------------------- +Sat Apr 11 09:09:18 UTC 2015 - mimi.vx@gmail.com + +- update to 0.5.4.2 +* no upstreqm changelog + +------------------------------------------------------------------- +Fri Sep 12 06:54:28 UTC 2014 - peter.trommler@ohm-hochschule.de + +- update copyright notice (year) in spec file + +------------------------------------------------------------------- +Sat Aug 23 00:31:27 UTC 2014 - peter.trommler@ohm-hochschule.de + +- enable PowerPC builds + +------------------------------------------------------------------- +Mon May 6 10:45:21 UTC 2013 - peter.trommler@ohm-hochschule.de + +- update to 0.5.4.1 +* no changelog +- part of Haskell Platform 2013.2 update +- more transparent packaging (fewer macros) + +------------------------------------------------------------------- +Thu Dec 27 12:28:22 UTC 2012 - peter.trommler@ohm-hochschule.de + +- fix license tag (intentionally empty 3rd clause) +- expand macro in name tag (help factory-auto) + +------------------------------------------------------------------- +Sat Nov 17 14:58:26 UTC 2012 - peter.trommler@ohm-hochschule.de + +- make service localonly for Factory submission + +------------------------------------------------------------------- +Tue Oct 2 11:21:27 UTC 2012 - peter.trommler@ohm-hochschule.de + +- update to 0.5.4.0 from upstream (no changelog) +- required by Haskell Platform 2012.4.0.0 + +------------------------------------------------------------------- +Mon Jun 4 06:51:40 UTC 2012 - peter.trommler@ohm-hochschule.de + +- update to 0.5.3.3 from upstream (no changelog) +- required by Haskell Platform 2012.2.0.0 + +------------------------------------------------------------------- +Thu Feb 23 13:42:43 UTC 2012 - peter.trommler@ohm-hochschule.de + +- Added BuildRoot for sle11-sp1 + +------------------------------------------------------------------- +Thu Dec 15 09:33:05 UTC 2011 - peter.trommler@ohm-hochschule.de + +- Added requires zlib-devel + +------------------------------------------------------------------- +Thu Dec 15 09:08:25 UTC 2011 - peter.trommler@ohm-hochschule.de + +- Add arches for OBS. + +------------------------------------------------------------------- +Thu Dec 15 09:06:35 UTC 2011 - peter.trommler@ohm-hochschule.de + +- Initial packaging. From 35ad8007cb3d834c668d001cc8bd3f4da469ceb2d4dc308b914b1a37daf87f7d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 1 Apr 2020 17:26:21 +0000 Subject: [PATCH 3/4] osc copypac from project:devel:languages:haskell:ghc-8.8.x package:ghc-zlib revision:5, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-zlib?expand=0&rev=50 --- ghc-zlib.spec | 2 + zlib.cabal | 111 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 113 insertions(+) create mode 100644 zlib.cabal diff --git a/ghc-zlib.spec b/ghc-zlib.spec index d40b97b..3db4fd2 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -25,6 +25,7 @@ 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 @@ -59,6 +60,7 @@ This package provides the Haskell %{pkg_name} library development files. %prep %setup -q -n %{pkg_name}-%{version} +cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build diff --git a/zlib.cabal b/zlib.cabal new file mode 100644 index 0000000..26ab193 --- /dev/null +++ b/zlib.cabal @@ -0,0 +1,111 @@ +cabal-version: >= 1.10 +name: zlib +version: 0.6.2.1 +x-revision: 1 + +copyright: (c) 2006-2016 Duncan Coutts +license: BSD3 +license-file: LICENSE +author: Duncan Coutts +maintainer: Duncan Coutts +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.1, GHC==8.0.2, GHC ==8.2.2, GHC ==8.4.4, GHC==8.6.5, GHC==8.8.3, GHC==8.10.1 + +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. + +library + exposed-modules: Codec.Compression.GZip, + Codec.Compression.Zlib, + Codec.Compression.Zlib.Raw, + Codec.Compression.Zlib.Internal + other-modules: Codec.Compression.Zlib.Stream + 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.15, + bytestring >= 0.9 && < 0.11 + if impl(ghc >= 7.2 && < 7.6) + 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) + -- NB: pkg-config is available on windows as well when using msys2 + pkgconfig-depends: zlib + else + -- don't use pkg-config + if !os(windows) + -- 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.8 + 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.3, + tasty-quickcheck >= 0.8 && < 0.11, + tasty-hunit >= 0.8 && < 0.11 + ghc-options: -Wall From 612fb10576cd4e40df2732f847085122dd53173241d9551169f042e435338e64 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 7 May 2020 08:45:48 +0000 Subject: [PATCH 4/4] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-zlib revision:6, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-zlib?expand=0&rev=51 --- ghc-zlib.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ghc-zlib.changes b/ghc-zlib.changes index 56ba718..ccc0207 100644 --- a/ghc-zlib.changes +++ b/ghc-zlib.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu May 7 08:08:29 UTC 2020 - Peter Simons + +- Update Cabal file to get more accurate dependency information. + ------------------------------------------------------------------- Fri Nov 8 16:15:18 UTC 2019 - Peter Simons