From 191f7970c124f2489b03844f721de73a41ed944d42162ddc2c249ac224697abc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Sep 2020 15:04:11 +0000 Subject: [PATCH 1/5] osc copypac from project:devel:languages:haskell:ghc-8.6.x package:ghc-safe revision:7, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-safe?expand=0&rev=40 --- ghc-safe.changes | 12 -------- ghc-safe.spec | 8 +++-- safe-0.3.18.tar.gz | 3 ++ safe-0.3.19.tar.gz | 3 -- safe.cabal | 74 ++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 82 insertions(+), 18 deletions(-) create mode 100644 safe-0.3.18.tar.gz delete mode 100644 safe-0.3.19.tar.gz create mode 100644 safe.cabal diff --git a/ghc-safe.changes b/ghc-safe.changes index c1c54f2..6132767 100644 --- a/ghc-safe.changes +++ b/ghc-safe.changes @@ -1,15 +1,3 @@ -------------------------------------------------------------------- -Tue Aug 18 10:45:55 UTC 2020 - Peter Simons - -- Replace %setup -q with the more modern %autosetup macro. - -------------------------------------------------------------------- -Tue Jun 9 09:10:54 UTC 2020 - psimons@suse.com - -- Update safe to version 0.3.19. - 0.3.19, released 2020-05-24 - #30, undeprecate maximumDef and friends, fold*1Def - ------------------------------------------------------------------- Thu Dec 5 03:02:47 UTC 2019 - psimons@suse.com diff --git a/ghc-safe.spec b/ghc-safe.spec index 2c91d7b..bcaf966 100644 --- a/ghc-safe.spec +++ b/ghc-safe.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-safe # -# 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,12 +19,13 @@ %global pkg_name safe %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.3.19 +Version: 0.3.18 Release: 0 Summary: Library of safe (exception free) functions License: BSD-3-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-rpm-macros %if %{with tests} @@ -70,7 +71,8 @@ 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} +cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build diff --git a/safe-0.3.18.tar.gz b/safe-0.3.18.tar.gz new file mode 100644 index 0000000..26acb06 --- /dev/null +++ b/safe-0.3.18.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d7775be28af83beeee2fa8921201c6b93358ba6a23a2967d53e5f382a9ec0fed +size 11208 diff --git a/safe-0.3.19.tar.gz b/safe-0.3.19.tar.gz deleted file mode 100644 index c17a1ff..0000000 --- a/safe-0.3.19.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:25043442c8f8aa95955bb17467d023630632b961aaa61e807e325d9b2c33f7a2 -size 11267 diff --git a/safe.cabal b/safe.cabal new file mode 100644 index 0000000..591e07b --- /dev/null +++ b/safe.cabal @@ -0,0 +1,74 @@ +cabal-version: >= 1.18 +build-type: Simple +name: safe +version: 0.3.18 +x-revision: 1 +license: BSD3 +license-file: LICENSE +category: Unclassified +author: Neil Mitchell +maintainer: Neil Mitchell +copyright: Neil Mitchell 2007-2019 +homepage: https://github.com/ndmitchell/safe#readme +synopsis: Library of safe (exception free) functions +bug-reports: https://github.com/ndmitchell/safe/issues +tested-with: GHC==8.8.1, GHC==8.6.5, GHC==8.4.4, GHC==8.2.2, GHC==8.0.2, GHC==7.10.3 +description: + A library wrapping @Prelude@/@Data.List@ functions that can throw exceptions, such as @head@ and @!!@. + Each unsafe function has up to four variants, e.g. with @tail@: + . + * @tail :: [a] -> [a]@, raises an error on @tail []@. + . + * @tailMay :: [a] -> /Maybe/ [a]@, turns errors into @Nothing@. + . + * @tailDef :: /[a]/ -> [a] -> [a]@, takes a default to return on errors. + . + * @tailNote :: /String/ -> [a] -> [a]@, takes an extra argument which supplements the error message. + . + * @tailSafe :: [a] -> [a]@, returns some sensible default if possible, @[]@ in the case of @tail@. + . + This package is divided into three modules: + . + * "Safe" contains safe variants of @Prelude@ and @Data.List@ functions. + . + * "Safe.Foldable" contains safe variants of @Foldable@ functions. + . + * "Safe.Exact" creates crashing versions of functions like @zip@ (errors if the lists are not equal) and @take@ (errors if there are not enough elements), then wraps them to provide safe variants. +extra-doc-files: + CHANGES.txt + README.md + +source-repository head + type: git + location: https://github.com/ndmitchell/safe.git + +library + default-language: Haskell2010 + build-depends: + base >= 4.8 && < 5 + + exposed-modules: + Safe + Safe.Exact + Safe.Foldable + Safe.Partial + + other-modules: + Safe.Util + +test-suite safe-test + type: exitcode-stdio-1.0 + main-is: Test.hs + default-language: Haskell2010 + + other-modules: + Safe + Safe.Exact + Safe.Foldable + Safe.Partial + Safe.Util + build-depends: + base, + deepseq, + QuickCheck, + safe From b1c4b76c77df6001e24ca4508229bdc6f0f44472edb265ca978b1c28c880bf41 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Sep 2020 15:11:30 +0000 Subject: [PATCH 2/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-safe revision:6, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-safe?expand=0&rev=41 --- ghc-safe.changes | 12 ++++++++ ghc-safe.spec | 8 ++--- safe-0.3.18.tar.gz | 3 -- safe-0.3.19.tar.gz | 3 ++ safe.cabal | 74 ---------------------------------------------- 5 files changed, 18 insertions(+), 82 deletions(-) delete mode 100644 safe-0.3.18.tar.gz create mode 100644 safe-0.3.19.tar.gz delete mode 100644 safe.cabal diff --git a/ghc-safe.changes b/ghc-safe.changes index 6132767..c1c54f2 100644 --- a/ghc-safe.changes +++ b/ghc-safe.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Tue Aug 18 10:45:55 UTC 2020 - Peter Simons + +- Replace %setup -q with the more modern %autosetup macro. + +------------------------------------------------------------------- +Tue Jun 9 09:10:54 UTC 2020 - psimons@suse.com + +- Update safe to version 0.3.19. + 0.3.19, released 2020-05-24 + #30, undeprecate maximumDef and friends, fold*1Def + ------------------------------------------------------------------- Thu Dec 5 03:02:47 UTC 2019 - psimons@suse.com diff --git a/ghc-safe.spec b/ghc-safe.spec index bcaf966..2c91d7b 100644 --- a/ghc-safe.spec +++ b/ghc-safe.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-safe # -# 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,13 +19,12 @@ %global pkg_name safe %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.3.18 +Version: 0.3.19 Release: 0 Summary: Library of safe (exception free) functions License: BSD-3-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-rpm-macros %if %{with tests} @@ -71,8 +70,7 @@ Requires(postun): ghc-compiler = %{ghc_version} This package provides the Haskell %{pkg_name} library development files. %prep -%setup -q -n %{pkg_name}-%{version} -cp -p %{SOURCE1} %{pkg_name}.cabal +%autosetup -n %{pkg_name}-%{version} %build %ghc_lib_build diff --git a/safe-0.3.18.tar.gz b/safe-0.3.18.tar.gz deleted file mode 100644 index 26acb06..0000000 --- a/safe-0.3.18.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d7775be28af83beeee2fa8921201c6b93358ba6a23a2967d53e5f382a9ec0fed -size 11208 diff --git a/safe-0.3.19.tar.gz b/safe-0.3.19.tar.gz new file mode 100644 index 0000000..c17a1ff --- /dev/null +++ b/safe-0.3.19.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:25043442c8f8aa95955bb17467d023630632b961aaa61e807e325d9b2c33f7a2 +size 11267 diff --git a/safe.cabal b/safe.cabal deleted file mode 100644 index 591e07b..0000000 --- a/safe.cabal +++ /dev/null @@ -1,74 +0,0 @@ -cabal-version: >= 1.18 -build-type: Simple -name: safe -version: 0.3.18 -x-revision: 1 -license: BSD3 -license-file: LICENSE -category: Unclassified -author: Neil Mitchell -maintainer: Neil Mitchell -copyright: Neil Mitchell 2007-2019 -homepage: https://github.com/ndmitchell/safe#readme -synopsis: Library of safe (exception free) functions -bug-reports: https://github.com/ndmitchell/safe/issues -tested-with: GHC==8.8.1, GHC==8.6.5, GHC==8.4.4, GHC==8.2.2, GHC==8.0.2, GHC==7.10.3 -description: - A library wrapping @Prelude@/@Data.List@ functions that can throw exceptions, such as @head@ and @!!@. - Each unsafe function has up to four variants, e.g. with @tail@: - . - * @tail :: [a] -> [a]@, raises an error on @tail []@. - . - * @tailMay :: [a] -> /Maybe/ [a]@, turns errors into @Nothing@. - . - * @tailDef :: /[a]/ -> [a] -> [a]@, takes a default to return on errors. - . - * @tailNote :: /String/ -> [a] -> [a]@, takes an extra argument which supplements the error message. - . - * @tailSafe :: [a] -> [a]@, returns some sensible default if possible, @[]@ in the case of @tail@. - . - This package is divided into three modules: - . - * "Safe" contains safe variants of @Prelude@ and @Data.List@ functions. - . - * "Safe.Foldable" contains safe variants of @Foldable@ functions. - . - * "Safe.Exact" creates crashing versions of functions like @zip@ (errors if the lists are not equal) and @take@ (errors if there are not enough elements), then wraps them to provide safe variants. -extra-doc-files: - CHANGES.txt - README.md - -source-repository head - type: git - location: https://github.com/ndmitchell/safe.git - -library - default-language: Haskell2010 - build-depends: - base >= 4.8 && < 5 - - exposed-modules: - Safe - Safe.Exact - Safe.Foldable - Safe.Partial - - other-modules: - Safe.Util - -test-suite safe-test - type: exitcode-stdio-1.0 - main-is: Test.hs - default-language: Haskell2010 - - other-modules: - Safe - Safe.Exact - Safe.Foldable - Safe.Partial - Safe.Util - build-depends: - base, - deepseq, - QuickCheck, - safe From 084e34a628e7b2108864240768a78dd353afa82bcfd6b538e2eb278cfe024a3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Fri, 18 Dec 2020 12:52:53 +0000 Subject: [PATCH 3/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-safe revision:8, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-safe?expand=0&rev=42 --- ghc-safe.changes | 5 +++++ ghc-safe.spec | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/ghc-safe.changes b/ghc-safe.changes index c1c54f2..ac7a55a 100644 --- a/ghc-safe.changes +++ b/ghc-safe.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:55 UTC 2020 - Peter Simons diff --git a/ghc-safe.spec b/ghc-safe.spec index 2c91d7b..4ead671 100644 --- a/ghc-safe.spec +++ b/ghc-safe.spec @@ -27,6 +27,12 @@ URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros +# 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-deepseq-devel From fa209039ec00f75dadb60cde9d69fb36450c655bb1075ffd997e8fadc016e70d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 17:49:05 +0000 Subject: [PATCH 4/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-safe revision:10, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-safe?expand=0&rev=43 --- ghc-safe.changes | 2 +- ghc-safe.spec | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/ghc-safe.changes b/ghc-safe.changes index ac7a55a..67b8dcb 100644 --- a/ghc-safe.changes +++ b/ghc-safe.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:55 UTC 2020 - Peter Simons diff --git a/ghc-safe.spec b/ghc-safe.spec index 4ead671..fbf10d9 100644 --- a/ghc-safe.spec +++ b/ghc-safe.spec @@ -27,12 +27,7 @@ URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros -# 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-deepseq-devel From 77c45408a179ab89001a05f69f59d7d86377c0981c303f565f522db0810e11e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 18:29:16 +0000 Subject: [PATCH 5/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-safe revision:11, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-safe?expand=0&rev=44 --- ghc-safe.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-safe.changes b/ghc-safe.changes index 67b8dcb..5e9ea59 100644 --- a/ghc-safe.changes +++ b/ghc-safe.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