From feccc342ee914cc18b396ee9d74b78bbd4cdf1c7bb5065ac4204b44fbaccd49e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Sep 2020 15:04:08 +0000 Subject: [PATCH 1/5] osc copypac from project:devel:languages:haskell:ghc-8.6.x package:ghc-resourcet revision:5, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-resourcet?expand=0&rev=64 --- ghc-resourcet.changes | 35 ----------------------------------- ghc-resourcet.spec | 6 +++--- resourcet-1.2.2.tar.gz | 3 +++ resourcet-1.2.4.2.tar.gz | 3 --- 4 files changed, 6 insertions(+), 41 deletions(-) create mode 100644 resourcet-1.2.2.tar.gz delete mode 100644 resourcet-1.2.4.2.tar.gz diff --git a/ghc-resourcet.changes b/ghc-resourcet.changes index 47755d7..901985a 100644 --- a/ghc-resourcet.changes +++ b/ghc-resourcet.changes @@ -1,38 +1,3 @@ -------------------------------------------------------------------- -Tue Aug 18 10:45:54 UTC 2020 - Peter Simons - -- Replace %setup -q with the more modern %autosetup macro. - -------------------------------------------------------------------- -Fri Jun 26 02:00:26 UTC 2020 - psimons@suse.com - -- Update resourcet to version 1.2.4.2. - ## 1.2.4.2 - - * Mask exceptions in `Acquire` allocation action - -------------------------------------------------------------------- -Tue Jun 9 09:10:54 UTC 2020 - psimons@suse.com - -- Update resourcet to version 1.2.4.1. - ## 1.2.4.1 - - * Document risk of using `forkIO` within a `ResourceT` [#441](https://github.com/snoyberg/conduit/pull/441) - - ## 1.2.4 - - * Add `allocate_` [#437](https://github.com/snoyberg/conduit/pull/437) - -------------------------------------------------------------------- -Wed May 6 06:54:13 UTC 2020 - psimons@suse.com - -- Update resourcet to version 1.2.4. - # ChangeLog for resourcet - - ## 1.2.3 - - * Support `unliftio-core` 0.2.0.0 - ------------------------------------------------------------------- Fri Nov 8 16:14:36 UTC 2019 - Peter Simons diff --git a/ghc-resourcet.spec b/ghc-resourcet.spec index 4387920..ef155b8 100644 --- a/ghc-resourcet.spec +++ b/ghc-resourcet.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-resourcet # -# 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 resourcet %bcond_with tests Name: ghc-%{pkg_name} -Version: 1.2.4.2 +Version: 1.2.2 Release: 0 Summary: Deterministic allocation and freeing of scarce resources License: BSD-3-Clause @@ -52,7 +52,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/resourcet-1.2.2.tar.gz b/resourcet-1.2.2.tar.gz new file mode 100644 index 0000000..a70c037 --- /dev/null +++ b/resourcet-1.2.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1323425aba3827479eb3588efaf7608b12a083327d64ec814f02863c3673cbe5 +size 16541 diff --git a/resourcet-1.2.4.2.tar.gz b/resourcet-1.2.4.2.tar.gz deleted file mode 100644 index 8e843fd..0000000 --- a/resourcet-1.2.4.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:17f20842043ad199961a801b6efb1233b9098eb3537f8395844268f6a223eb87 -size 16862 From 7bddfddbd3b6fe12245b53ddaf860bc55dc0d0d040326038344d25d5c1741556 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Sep 2020 15:11:29 +0000 Subject: [PATCH 2/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-resourcet revision:9, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-resourcet?expand=0&rev=65 --- ghc-resourcet.changes | 35 +++++++++++++++++++++++++++++++++++ ghc-resourcet.spec | 6 +++--- resourcet-1.2.2.tar.gz | 3 --- resourcet-1.2.4.2.tar.gz | 3 +++ 4 files changed, 41 insertions(+), 6 deletions(-) delete mode 100644 resourcet-1.2.2.tar.gz create mode 100644 resourcet-1.2.4.2.tar.gz diff --git a/ghc-resourcet.changes b/ghc-resourcet.changes index 901985a..47755d7 100644 --- a/ghc-resourcet.changes +++ b/ghc-resourcet.changes @@ -1,3 +1,38 @@ +------------------------------------------------------------------- +Tue Aug 18 10:45:54 UTC 2020 - Peter Simons + +- Replace %setup -q with the more modern %autosetup macro. + +------------------------------------------------------------------- +Fri Jun 26 02:00:26 UTC 2020 - psimons@suse.com + +- Update resourcet to version 1.2.4.2. + ## 1.2.4.2 + + * Mask exceptions in `Acquire` allocation action + +------------------------------------------------------------------- +Tue Jun 9 09:10:54 UTC 2020 - psimons@suse.com + +- Update resourcet to version 1.2.4.1. + ## 1.2.4.1 + + * Document risk of using `forkIO` within a `ResourceT` [#441](https://github.com/snoyberg/conduit/pull/441) + + ## 1.2.4 + + * Add `allocate_` [#437](https://github.com/snoyberg/conduit/pull/437) + +------------------------------------------------------------------- +Wed May 6 06:54:13 UTC 2020 - psimons@suse.com + +- Update resourcet to version 1.2.4. + # ChangeLog for resourcet + + ## 1.2.3 + + * Support `unliftio-core` 0.2.0.0 + ------------------------------------------------------------------- Fri Nov 8 16:14:36 UTC 2019 - Peter Simons diff --git a/ghc-resourcet.spec b/ghc-resourcet.spec index ef155b8..4387920 100644 --- a/ghc-resourcet.spec +++ b/ghc-resourcet.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-resourcet # -# 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 resourcet %bcond_with tests Name: ghc-%{pkg_name} -Version: 1.2.2 +Version: 1.2.4.2 Release: 0 Summary: Deterministic allocation and freeing of scarce resources License: BSD-3-Clause @@ -52,7 +52,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/resourcet-1.2.2.tar.gz b/resourcet-1.2.2.tar.gz deleted file mode 100644 index a70c037..0000000 --- a/resourcet-1.2.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1323425aba3827479eb3588efaf7608b12a083327d64ec814f02863c3673cbe5 -size 16541 diff --git a/resourcet-1.2.4.2.tar.gz b/resourcet-1.2.4.2.tar.gz new file mode 100644 index 0000000..8e843fd --- /dev/null +++ b/resourcet-1.2.4.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:17f20842043ad199961a801b6efb1233b9098eb3537f8395844268f6a223eb87 +size 16862 From c937e374df93800c8a9c9f765e3c9c3ef7041ff91d03f10e79f30384eb3b5aed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Fri, 18 Dec 2020 12:52:52 +0000 Subject: [PATCH 3/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-resourcet revision:11, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-resourcet?expand=0&rev=66 --- ghc-resourcet.changes | 5 +++++ ghc-resourcet.spec | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/ghc-resourcet.changes b/ghc-resourcet.changes index 47755d7..e3bb172 100644 --- a/ghc-resourcet.changes +++ b/ghc-resourcet.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:45:54 UTC 2020 - Peter Simons diff --git a/ghc-resourcet.spec b/ghc-resourcet.spec index 4387920..79fa376 100644 --- a/ghc-resourcet.spec +++ b/ghc-resourcet.spec @@ -33,6 +33,12 @@ BuildRequires: ghc-primitive-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-transformers-devel BuildRequires: ghc-unliftio-core-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-hspec-devel %endif From 56292abdfdfbb6efa92b46c13d4bd938d5ea4ba42571acd09068760386959718 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 17:49:04 +0000 Subject: [PATCH 4/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-resourcet revision:13, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-resourcet?expand=0&rev=67 --- ghc-resourcet.changes | 2 +- ghc-resourcet.spec | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/ghc-resourcet.changes b/ghc-resourcet.changes index e3bb172..748b486 100644 --- a/ghc-resourcet.changes +++ b/ghc-resourcet.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:45:54 UTC 2020 - Peter Simons diff --git a/ghc-resourcet.spec b/ghc-resourcet.spec index 79fa376..d4a933f 100644 --- a/ghc-resourcet.spec +++ b/ghc-resourcet.spec @@ -33,12 +33,7 @@ BuildRequires: ghc-primitive-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-transformers-devel BuildRequires: ghc-unliftio-core-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-hspec-devel %endif From 0c4288d1b55169bc88364214a4a1d9c509c822da17caf2d8ac593c608eed8830 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 18:29:15 +0000 Subject: [PATCH 5/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-resourcet revision:14, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-resourcet?expand=0&rev=68 --- ghc-resourcet.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-resourcet.changes b/ghc-resourcet.changes index 748b486..23ca767 100644 --- a/ghc-resourcet.changes +++ b/ghc-resourcet.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