Compare commits

...

No commits in common. "c8" and "e3674d2d01074ce395946322c8a28f26d783092f" have entirely different histories.

8 changed files with 275 additions and 21 deletions

View File

@ -1 +1 @@
8c61bcd4bada33362dd0c538305267ab0d94d582 SOURCES/zlib-0.6.1.2.tar.gz
3ee030a58bf9800b049a0416592ff554abd31267 zlib-0.6.2.1.tar.gz

7
.gitignore vendored
View File

@ -1 +1,6 @@
SOURCES/zlib-0.6.1.2.tar.gz
/zlib-0.5.4.1.tar.gz
/zlib-0.5.4.2.tar.gz
/zlib-0.6.1.1.tar.gz
/zlib-0.6.1.2.tar.gz
/zlib-0.6.2.tar.gz
/zlib-0.6.2.1.tar.gz

1
dead.package Normal file
View File

@ -0,0 +1 @@
ghc-zlib package is retired on c9s for CS-611

View File

@ -1,23 +1,28 @@
# generated by cabal-rpm-0.12.1
# https://fedoraproject.org/wiki/Packaging:Haskell
# generated by cabal-rpm-2.0.6
# https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/
%global pkg_name zlib
%global pkgver %{pkg_name}-%{version}
%bcond_with tests
Name: ghc-%{pkg_name}
# part of haskell-platform
Version: 0.6.1.2
Version: 0.6.2.1
Release: 6%{?dist}
Summary: Compression and decompression in the gzip and zlib formats
License: BSD
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
# Begin cabal-rpm deps:
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-rpm-macros
# Begin cabal-rpm deps:
BuildRequires: ghc-bytestring-devel
BuildRequires: ghc-base-prof
BuildRequires: ghc-bytestring-prof
BuildRequires: zlib-devel
%if %{with tests}
BuildRequires: ghc-QuickCheck-devel
@ -41,11 +46,9 @@ set.
%package devel
Summary: Haskell %{pkg_name} library development files
Provides: %{name}-static = %{version}-%{release}
Provides: %{name}-doc = %{version}-%{release}
Provides: %{name}-static%{?_isa} = %{version}-%{release}
%if %{defined ghc_version}
Requires: ghc-compiler = %{ghc_version}
Requires(post): ghc-compiler = %{ghc_version}
Requires(postun): ghc-compiler = %{ghc_version}
%endif
Requires: %{name}%{?_isa} = %{version}-%{release}
# Begin cabal-rpm deps:
@ -56,42 +59,124 @@ Requires: zlib-devel%{?_isa}
This package provides the Haskell %{pkg_name} library development files.
%prep
%setup -q -n %{pkgver}
%if %{with haddock}
%package doc
Summary: Haskell %{pkg_name} library documentation
BuildArch: noarch
%description doc
This package provides the Haskell %{pkg_name} library documentation.
%endif
%if %{with ghc_prof}
%package prof
Summary: Haskell %{pkg_name} profiling library
Requires: %{name}-devel%{?_isa} = %{version}-%{release}
Supplements: (%{name}-devel and ghc-prof)
%description prof
This package provides the Haskell %{pkg_name} profiling library.
%endif
%prep
# Begin cabal-rpm setup:
%setup -q -n %{pkgver}
cp -bp %{SOURCE1} %{pkg_name}.cabal
chmod a-x changelog
# End cabal-rpm setup
#remove the copy library
rm -r cbits
%build
# Begin cabal-rpm build:
%ghc_lib_build
# End cabal-rpm build
%install
# Begin cabal-rpm install
%ghc_lib_install
# End cabal-rpm install
%check
%cabal_test
%post devel
%ghc_pkg_recache
%postun devel
%ghc_pkg_recache
%files -f %{name}.files
# Begin cabal-rpm files:
%license LICENSE
# End cabal-rpm files
%files devel -f %{name}-devel.files
%doc changelog examples
%if %{with haddock}
%files doc -f %{name}-doc.files
%license LICENSE
%endif
%if %{with ghc_prof}
%files prof -f %{name}-prof.files
%endif
%changelog
* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 0.6.2.1-6
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.2.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.2.1-4
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.2.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Fri Jul 17 2020 Jens Petersen <petersen@redhat.com> - 0.6.2.1-2
- refresh to cabal-rpm-2.0.6
* Fri Feb 14 2020 Jens Petersen <petersen@redhat.com> - 0.6.2.1-1
- update to 0.6.2.1
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.2-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Wed Aug 28 2019 Jens Petersen <petersen@redhat.com> - 0.6.2-8
- bump the tasty upperbounds instead of removing
* Wed Aug 14 2019 Jens Petersen <petersen@redhat.com> - 0.6.2-7
- disable testsuite since it caused ABI hash change
* Wed Aug 14 2019 Jens Petersen <petersen@redhat.com> - 0.6.2-6
- enable testsuite
* Fri Aug 02 2019 Jens Petersen <petersen@redhat.com> - 0.6.2-5
- add doc and prof subpackages (cabal-rpm-1.0.0)
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Sun Feb 17 2019 Jens Petersen <petersen@redhat.com> - 0.6.2-3
- refresh to cabal-rpm-0.13
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Sun Jul 22 2018 Jens Petersen <petersen@redhat.com> - 0.6.2-1
- update to 0.6.2
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1.2-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Thu Feb 15 2018 Jens Petersen <petersen@redhat.com> - 0.6.1.2-6
- remove _isa from buildrequires (#1545183)

1
sources Normal file
View File

@ -0,0 +1 @@
SHA512 (zlib-0.6.2.1.tar.gz) = cee7942a86afbd08f03c19abd88154cc866a3ccc52342264d4d5b28a71643adf30bf03ba939d6a98b7c065752f9ec326729fc38cfe72b66998551c89186048c5

11
tests/simple/runtest.sh Executable file
View File

@ -0,0 +1,11 @@
#!/usr/bin/sh
set -ex
SOURCEDIR=$1
cd "${SOURCEDIR}" || exit 1
cabal update
cabal install --enable-tests --only-dependencies
cabal test

40
tests/tests.yml Normal file
View File

@ -0,0 +1,40 @@
---
- hosts: localhost
tags:
- classic
vars:
# standard-test-basic directory for tests are relative to {{ tenv_workdir }}
tenv_workdir: /var/test
pre_tasks:
- import_role:
name: standard-test-source
vars:
fetch_only: True
- name: Copy files including source to test environment
synchronize:
src: "{{ playbook_dir }}/.."
dest: "{{ tenv_workdir }}"
mode: push
ssh_args: "-o UserKnownHostsFile=/dev/null"
roles:
- role: standard-test-basic
required_packages:
- cabal-install
- ghc-tasty-hunit-devel
- ghc-tasty-quickcheck-devel
- ghc-zlib-devel
- ghc-rpm-macros
- rpm-build
tests:
- prepare-source:
dir: ./
run: rpmbuild -bp {{ tenv_workdir }}/*.spec --nodeps --define "_sourcedir {{ tenv_workdir }}" --define "_builddir {{ tenv_workdir }}/source"
- flatten-source:
dir: ./
run: shopt -s dotglob; mv {{ tenv_workdir }}/source/*/* {{ tenv_workdir }}/source
- smoke:
dir: simple
run: ./runtest.sh {{ tenv_workdir }}/source/
...

111
zlib-0.6.2.1.cabal Normal file
View File

@ -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 <duncan@community.haskell.org>
maintainer: Duncan Coutts <duncan@community.haskell.org>
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
<https://en.wikipedia.org/wiki/Zlib 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
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