From 24a19a338186028972f659bea0db2f69b9fe8aadddea83f410779e79a6956a7f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Oct 2016 08:27:56 +0000 Subject: [PATCH 1/3] Accepting request 432841 from devel:languages:haskell:lts:7 version / revision update OBS-URL: https://build.opensuse.org/request/show/432841 OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-zlib?expand=0&rev=20 --- ghc-zlib.spec | 17 +---- 3.cabal => zlib.cabal | 174 +++++++++++++++++++++--------------------- 2 files changed, 90 insertions(+), 101 deletions(-) rename 3.cabal => zlib.cabal (97%) diff --git a/ghc-zlib.spec b/ghc-zlib.spec index ae02f5b..d3b7491 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -23,12 +23,11 @@ Version: 0.6.1.1 Release: 0 Summary: Compression and decompression in the gzip and zlib formats License: BSD-2-Clause -Group: System/Libraries +Group: Development/Languages/Other 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/3.cabal +Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/3.cabal#/%{pkg_name}.cabal BuildRequires: ghc-Cabal-devel -# Begin cabal-rpm deps: BuildRequires: ghc-bytestring-devel BuildRequires: ghc-rpm-macros BuildRequires: zlib-devel @@ -40,7 +39,6 @@ BuildRequires: ghc-tasty-devel BuildRequires: ghc-tasty-hunit-devel BuildRequires: ghc-tasty-quickcheck-devel %endif -# End cabal-rpm deps %description This package provides a pure interface for compressing and decompressing @@ -57,11 +55,9 @@ Summary: Haskell %{pkg_name} library development files Group: Development/Libraries/Other Requires: %{name} = %{version}-%{release} Requires: ghc-compiler = %{ghc_version} -# Begin cabal-rpm deps: Requires: zlib-devel Requires(post): ghc-compiler = %{ghc_version} Requires(postun): ghc-compiler = %{ghc_version} -# End cabal-rpm deps %description devel This package provides the Haskell %{pkg_name} library development files. @@ -70,20 +66,14 @@ This package provides the Haskell %{pkg_name} library development files. %setup -q -n %{pkg_name}-%{version} cp -p %{SOURCE1} %{pkg_name}.cabal - %build %ghc_lib_build - %install %ghc_lib_install - %check -%if %{with tests} -%{cabal} test -%endif - +%cabal_test %post devel %ghc_pkg_recache @@ -97,6 +87,5 @@ cp -p %{SOURCE1} %{pkg_name}.cabal %files devel -f %{name}-devel.files %defattr(-,root,root,-) -%doc changelog examples %changelog diff --git a/3.cabal b/zlib.cabal similarity index 97% rename from 3.cabal rename to zlib.cabal index 2e81bea..45657eb 100644 --- a/3.cabal +++ b/zlib.cabal @@ -1,87 +1,87 @@ -name: zlib -version: 0.6.1.1 -x-revision: 3 -copyright: (c) 2006-2015 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 zlib C library 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 -cabal-version: >= 1.10 -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 - -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 - build-depends: base >= 4 && < 5, - bytestring >= 0.9 && < 0.12 - if impl(ghc >= 7.2 && < 7.6) - build-depends: ghc-prim - includes: zlib.h - ghc-options: -Wall -fwarn-tabs - 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.*, - HUnit >= 1.2 && <1.4, - tasty >= 0.8 && < 0.12, - tasty-quickcheck == 0.8.*, - tasty-hunit >= 0.8 && < 0.9 - ghc-options: -Wall +name: zlib +version: 0.6.1.1 +x-revision: 3 +copyright: (c) 2006-2015 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 zlib C library 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 +cabal-version: >= 1.10 +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 + +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 + build-depends: base >= 4 && < 5, + bytestring >= 0.9 && < 0.12 + if impl(ghc >= 7.2 && < 7.6) + build-depends: ghc-prim + includes: zlib.h + ghc-options: -Wall -fwarn-tabs + 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.*, + HUnit >= 1.2 && <1.4, + tasty >= 0.8 && < 0.12, + tasty-quickcheck == 0.8.*, + tasty-hunit >= 0.8 && < 0.9 + ghc-options: -Wall From 38f8e33fb933bec12d16cdea1a69311597614a2a952d8353c9786432eb97cc6a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 5 Oct 2016 18:59:15 +0000 Subject: [PATCH 2/3] Use pristine copy of edited Cabal file from upstream. OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-zlib?expand=0&rev=21 --- zlib.cabal | 174 ++++++++++++++++++++++++++--------------------------- 1 file changed, 87 insertions(+), 87 deletions(-) diff --git a/zlib.cabal b/zlib.cabal index 45657eb..2e81bea 100644 --- a/zlib.cabal +++ b/zlib.cabal @@ -1,87 +1,87 @@ -name: zlib -version: 0.6.1.1 -x-revision: 3 -copyright: (c) 2006-2015 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 zlib C library 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 -cabal-version: >= 1.10 -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 - -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 - build-depends: base >= 4 && < 5, - bytestring >= 0.9 && < 0.12 - if impl(ghc >= 7.2 && < 7.6) - build-depends: ghc-prim - includes: zlib.h - ghc-options: -Wall -fwarn-tabs - 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.*, - HUnit >= 1.2 && <1.4, - tasty >= 0.8 && < 0.12, - tasty-quickcheck == 0.8.*, - tasty-hunit >= 0.8 && < 0.9 - ghc-options: -Wall +name: zlib +version: 0.6.1.1 +x-revision: 3 +copyright: (c) 2006-2015 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 zlib C library 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 +cabal-version: >= 1.10 +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 + +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 + build-depends: base >= 4 && < 5, + bytestring >= 0.9 && < 0.12 + if impl(ghc >= 7.2 && < 7.6) + build-depends: ghc-prim + includes: zlib.h + ghc-options: -Wall -fwarn-tabs + 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.*, + HUnit >= 1.2 && <1.4, + tasty >= 0.8 && < 0.12, + tasty-quickcheck == 0.8.*, + tasty-hunit >= 0.8 && < 0.9 + ghc-options: -Wall From 1d35be6d1013a1055f30553d6bc81dbe80f5ad6e61bb85b065eebde1d8fa449c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 31 Oct 2016 14:35:44 +0000 Subject: [PATCH 3/3] opensuse haskell configuration 57299b7b95fb22a225c59ac23c5daf22590d6547 OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-zlib?expand=0&rev=22 --- ghc-zlib.changes | 5 +++ ghc-zlib.spec | 12 +++---- zlib-0.6.1.1.tar.gz | 3 -- zlib-0.6.1.2.tar.gz | 3 ++ zlib.cabal | 87 --------------------------------------------- 5 files changed, 13 insertions(+), 97 deletions(-) delete mode 100644 zlib-0.6.1.1.tar.gz create mode 100644 zlib-0.6.1.2.tar.gz delete mode 100644 zlib.cabal diff --git a/ghc-zlib.changes b/ghc-zlib.changes index db3d9f0..d379954 100644 --- a/ghc-zlib.changes +++ b/ghc-zlib.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/ghc-zlib.spec b/ghc-zlib.spec index d3b7491..1fc677d 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -19,21 +19,19 @@ %global pkg_name zlib %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.6.1.1 +Version: 0.6.1.2 Release: 0 Summary: Compression and decompression in the gzip and zlib formats License: BSD-2-Clause Group: Development/Languages/Other 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/3.cabal#/%{pkg_name}.cabal BuildRequires: ghc-Cabal-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-rpm-macros BuildRequires: zlib-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %{with tests} -BuildRequires: ghc-HUnit-devel BuildRequires: ghc-QuickCheck-devel BuildRequires: ghc-tasty-devel BuildRequires: ghc-tasty-hunit-devel @@ -42,9 +40,9 @@ BuildRequires: ghc-tasty-quickcheck-devel %description This package provides a pure interface for compressing and decompressing -streams of data represented as lazy 'ByteString's. It uses the zlib C library -so it has high performance. It supports the "zlib", "gzip" and "raw" -compression formats. +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 @@ -64,7 +62,6 @@ 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 @@ -87,5 +84,6 @@ cp -p %{SOURCE1} %{pkg_name}.cabal %files devel -f %{name}-devel.files %defattr(-,root,root,-) +%doc changelog examples %changelog diff --git a/zlib-0.6.1.1.tar.gz b/zlib-0.6.1.1.tar.gz deleted file mode 100644 index b651c59..0000000 --- a/zlib-0.6.1.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c5f5b4285473657a7997d74f7642f3e7bda40f92c3c5d49471a899e27a4ba735 -size 142902 diff --git a/zlib-0.6.1.2.tar.gz b/zlib-0.6.1.2.tar.gz new file mode 100644 index 0000000..9f642c6 --- /dev/null +++ b/zlib-0.6.1.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e4eb4e636caf07a16a9730ce469a00b65d5748f259f43edd904dd457b198a2bb +size 142413 diff --git a/zlib.cabal b/zlib.cabal deleted file mode 100644 index 2e81bea..0000000 --- a/zlib.cabal +++ /dev/null @@ -1,87 +0,0 @@ -name: zlib -version: 0.6.1.1 -x-revision: 3 -copyright: (c) 2006-2015 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 zlib C library 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 -cabal-version: >= 1.10 -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 - -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 - build-depends: base >= 4 && < 5, - bytestring >= 0.9 && < 0.12 - if impl(ghc >= 7.2 && < 7.6) - build-depends: ghc-prim - includes: zlib.h - ghc-options: -Wall -fwarn-tabs - 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.*, - HUnit >= 1.2 && <1.4, - tasty >= 0.8 && < 0.12, - tasty-quickcheck == 0.8.*, - tasty-hunit >= 0.8 && < 0.9 - ghc-options: -Wall