From 8fa15db30d237b05d8a42ae3301389586ff0b23e0a7e7af67b2170623d559a33 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Sep 2020 15:04:33 +0000 Subject: [PATCH 1/5] 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=61 --- ghc-zlib.changes | 26 -------------------------- ghc-zlib.spec | 6 +++--- zlib-0.6.2.1.tar.gz | 3 +++ zlib-0.6.2.2.tar.gz | 3 --- 4 files changed, 6 insertions(+), 32 deletions(-) create mode 100644 zlib-0.6.2.1.tar.gz delete mode 100644 zlib-0.6.2.2.tar.gz diff --git a/ghc-zlib.changes b/ghc-zlib.changes index 016ddcf..56ba718 100644 --- a/ghc-zlib.changes +++ b/ghc-zlib.changes @@ -1,29 +1,3 @@ -------------------------------------------------------------------- -Tue Aug 18 10:46:49 UTC 2020 - Peter Simons - -- Replace %setup -q with the more modern %autosetup macro. - -------------------------------------------------------------------- -Tue Aug 4 09:04:41 UTC 2020 - psimons@suse.com - -- Update zlib to version 0.6.2.2. - 0.6.2.2 Julian Ospald August 2020 - - * Bump bundled zlib to 1.2.11, fixes #26 - * New build flag to force use of the bundled zlib C sources, #31 - * Simpler build support for ghcjs, #25 - * Add support for GHC 8.10 / base-4.14, #29 - -------------------------------------------------------------------- -Tue Jun 16 11:14:55 UTC 2020 - Peter Simons - -- Re-generate file with latest version of spec-cleaner. - -------------------------------------------------------------------- -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 diff --git a/ghc-zlib.spec b/ghc-zlib.spec index 76adc57..d40b97b 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-zlib # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %global pkg_name zlib %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.6.2.2 +Version: 0.6.2.1 Release: 0 Summary: Compression and decompression in the gzip and zlib formats License: BSD-2-Clause @@ -58,7 +58,7 @@ Requires(postun): ghc-compiler = %{ghc_version} This package provides the Haskell %{pkg_name} library development files. %prep -%autosetup -n %{pkg_name}-%{version} +%setup -q -n %{pkg_name}-%{version} %build %ghc_lib_build diff --git a/zlib-0.6.2.1.tar.gz b/zlib-0.6.2.1.tar.gz new file mode 100644 index 0000000..6d84713 --- /dev/null +++ b/zlib-0.6.2.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f0f810ff173560b60392db448455c0513b3239f48e43cb494b3733aa559621d0 +size 143424 diff --git a/zlib-0.6.2.2.tar.gz b/zlib-0.6.2.2.tar.gz deleted file mode 100644 index a09e961..0000000 --- a/zlib-0.6.2.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:04b5890dd69e992f8cd09570d81e9d5ecab19db8e82cbe47ba8e02c31c0631ba -size 148178 From 5fc38bbfede93e9d45a822c9f15583ff23f9b91a25f17d721737339d49abcc5f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Sep 2020 15:12:03 +0000 Subject: [PATCH 2/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-zlib revision:11, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-zlib?expand=0&rev=62 --- ghc-zlib.changes | 26 ++++++++++++++++++++++++++ ghc-zlib.spec | 6 +++--- zlib-0.6.2.1.tar.gz | 3 --- zlib-0.6.2.2.tar.gz | 3 +++ 4 files changed, 32 insertions(+), 6 deletions(-) delete mode 100644 zlib-0.6.2.1.tar.gz create mode 100644 zlib-0.6.2.2.tar.gz diff --git a/ghc-zlib.changes b/ghc-zlib.changes index 56ba718..016ddcf 100644 --- a/ghc-zlib.changes +++ b/ghc-zlib.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Tue Aug 18 10:46:49 UTC 2020 - Peter Simons + +- Replace %setup -q with the more modern %autosetup macro. + +------------------------------------------------------------------- +Tue Aug 4 09:04:41 UTC 2020 - psimons@suse.com + +- Update zlib to version 0.6.2.2. + 0.6.2.2 Julian Ospald August 2020 + + * Bump bundled zlib to 1.2.11, fixes #26 + * New build flag to force use of the bundled zlib C sources, #31 + * Simpler build support for ghcjs, #25 + * Add support for GHC 8.10 / base-4.14, #29 + +------------------------------------------------------------------- +Tue Jun 16 11:14:55 UTC 2020 - Peter Simons + +- Re-generate file with latest version of spec-cleaner. + +------------------------------------------------------------------- +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 diff --git a/ghc-zlib.spec b/ghc-zlib.spec index d40b97b..76adc57 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-zlib # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %global pkg_name zlib %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.6.2.1 +Version: 0.6.2.2 Release: 0 Summary: Compression and decompression in the gzip and zlib formats License: BSD-2-Clause @@ -58,7 +58,7 @@ Requires(postun): ghc-compiler = %{ghc_version} This package provides the Haskell %{pkg_name} library development files. %prep -%setup -q -n %{pkg_name}-%{version} +%autosetup -n %{pkg_name}-%{version} %build %ghc_lib_build diff --git a/zlib-0.6.2.1.tar.gz b/zlib-0.6.2.1.tar.gz deleted file mode 100644 index 6d84713..0000000 --- a/zlib-0.6.2.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f0f810ff173560b60392db448455c0513b3239f48e43cb494b3733aa559621d0 -size 143424 diff --git a/zlib-0.6.2.2.tar.gz b/zlib-0.6.2.2.tar.gz new file mode 100644 index 0000000..a09e961 --- /dev/null +++ b/zlib-0.6.2.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:04b5890dd69e992f8cd09570d81e9d5ecab19db8e82cbe47ba8e02c31c0631ba +size 148178 From f6abc95521642d1af6a8f50bb0f9d688a91dd705b6c941fc6bf3cd2b71fc6492 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Fri, 18 Dec 2020 12:53:23 +0000 Subject: [PATCH 3/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-zlib revision:13, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-zlib?expand=0&rev=63 --- ghc-zlib.changes | 5 +++++ ghc-zlib.spec | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/ghc-zlib.changes b/ghc-zlib.changes index 016ddcf..3bdbe29 100644 --- a/ghc-zlib.changes +++ b/ghc-zlib.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Oct 17 12:20:00 UTC 2020 - Ondřej Súkup + +- force i686 arch on i586 + ------------------------------------------------------------------- Tue Aug 18 10:46:49 UTC 2020 - Peter Simons diff --git a/ghc-zlib.spec b/ghc-zlib.spec index 76adc57..6a0f199 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -29,6 +29,12 @@ BuildRequires: ghc-Cabal-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-rpm-macros BuildRequires: zlib-devel +# GHC dont support i586 +%ifarch %{ix86} +ExclusiveArch: i586 i686 +ExclusiveArch: i686 +%{expand:%%global optflags %(echo "%{optflags}"|sed -e s/i586/i686/) -march=i686 -mtune=generic} +%endif %if %{with tests} BuildRequires: ghc-QuickCheck-devel BuildRequires: ghc-tasty-devel From 5b4d5e8bfcff8dc234e36b4944efbf0ae1e7066a0a8259755693dd260fa39b35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 17:49:40 +0000 Subject: [PATCH 4/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-zlib revision:15, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-zlib?expand=0&rev=64 --- ghc-zlib.changes | 2 +- ghc-zlib.spec | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/ghc-zlib.changes b/ghc-zlib.changes index 3bdbe29..f02d56c 100644 --- a/ghc-zlib.changes +++ b/ghc-zlib.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Thu Oct 17 12:20:00 UTC 2020 - Ondřej Súkup -- force i686 arch on i586 +- disable %{ix86} build ------------------------------------------------------------------- Tue Aug 18 10:46:49 UTC 2020 - Peter Simons diff --git a/ghc-zlib.spec b/ghc-zlib.spec index 6a0f199..dd7eab6 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -29,12 +29,7 @@ BuildRequires: ghc-Cabal-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-rpm-macros BuildRequires: zlib-devel -# GHC dont support i586 -%ifarch %{ix86} -ExclusiveArch: i586 i686 -ExclusiveArch: i686 -%{expand:%%global optflags %(echo "%{optflags}"|sed -e s/i586/i686/) -march=i686 -mtune=generic} -%endif +ExcludeArch: %{ix86} %if %{with tests} BuildRequires: ghc-QuickCheck-devel BuildRequires: ghc-tasty-devel From b81e47bf0b13b52bec5bffe4276fbf01eeb9fb5bbe148acb6b8f76b6303629c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 18:29:45 +0000 Subject: [PATCH 5/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-zlib revision:16, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-zlib?expand=0&rev=65 --- ghc-zlib.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-zlib.changes b/ghc-zlib.changes index f02d56c..7703b98 100644 --- a/ghc-zlib.changes +++ b/ghc-zlib.changes @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Thu Oct 17 12:20:00 UTC 2020 - Ondřej Súkup +Thu Dec 17 12:20:00 UTC 2020 - Ondřej Súkup - disable %{ix86} build