From 67870da3f53ec9c72091890afb395054c849db2b93fd242a04a110bd20d298ad Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 1 Sep 2020 01:01:36 +0000 Subject: [PATCH 1/3] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-either revision:5, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-either?expand=0&rev=55 --- ghc-either.changes | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ghc-either.changes b/ghc-either.changes index 85196a8..ed350ea 100644 --- a/ghc-either.changes +++ b/ghc-either.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Aug 31 09:34:31 UTC 2020 - psimons@suse.com + +- Update either to version 5.0.1.1 revision 1. + Upstream has revised the Cabal build instructions on Hackage. + ------------------------------------------------------------------- Tue Aug 18 10:44:44 UTC 2020 - Peter Simons From e1820ffeaf4c26efbe40602c589cf02fd88f50ff0368f2244b8cf7436e045b9a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Sep 2020 15:03:17 +0000 Subject: [PATCH 2/3] osc copypac from project:devel:languages:haskell:ghc-8.6.x package:ghc-either revision:7, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-either?expand=0&rev=56 --- either.cabal | 70 ---------------------------------------------- ghc-either.changes | 16 ----------- ghc-either.spec | 6 ++-- 3 files changed, 2 insertions(+), 90 deletions(-) delete mode 100644 either.cabal diff --git a/either.cabal b/either.cabal deleted file mode 100644 index c494ebf..0000000 --- a/either.cabal +++ /dev/null @@ -1,70 +0,0 @@ -name: either -category: Control, Monads -version: 5.0.1.1 -x-revision: 1 -license: BSD3 -cabal-version: >= 1.10 -license-file: LICENSE -author: Edward A. Kmett -maintainer: Edward A. Kmett -stability: provisional -homepage: http://github.com/ekmett/either/ -bug-reports: http://github.com/ekmett/either/issues -copyright: Copyright (C) 2008-2017 Edward A. Kmett -synopsis: Combinators for working with sums -description: Combinators for working with sums. -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.2 - , GHC == 8.2.2 - , GHC == 8.4.4 - , GHC == 8.6.5 - , GHC == 8.8.1 -extra-source-files: - .gitignore - .ghci - .vim.custom - .travis.yml - CHANGELOG.markdown - README.markdown - -source-repository head - type: git - location: git://github.com/ekmett/either.git - -library - build-depends: - base >= 4 && < 5, - bifunctors >= 4 && < 6, - mtl >= 2.0 && < 2.3, - profunctors >= 4 && < 6, - semigroupoids >= 4 && < 6 - - if !impl(ghc >= 8.0) - build-depends: semigroups >= 0.8.3.1 && < 1 - - other-extensions: CPP Rank2Types - ghc-options: -Wall - hs-source-dirs: src - default-language: Haskell2010 - exposed-modules: - Data.Either.Combinators - Data.Either.Validation - -test-suite tests - ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N - type: exitcode-stdio-1.0 - main-is: Main.hs - hs-source-dirs: tests - build-depends: - base, - either, - test-framework >= 0.8.1.1 && < 0.9, - test-framework-quickcheck2 >= 0.3.0.3 && < 0.4, - QuickCheck >= 2.9 && < 2.15 - default-language: Haskell2010 diff --git a/ghc-either.changes b/ghc-either.changes index ed350ea..774abaf 100644 --- a/ghc-either.changes +++ b/ghc-either.changes @@ -1,19 +1,3 @@ -------------------------------------------------------------------- -Mon Aug 31 09:34:31 UTC 2020 - psimons@suse.com - -- Update either to version 5.0.1.1 revision 1. - Upstream has revised the Cabal build instructions on Hackage. - -------------------------------------------------------------------- -Tue Aug 18 10:44:44 UTC 2020 - Peter Simons - -- Replace %setup -q with the more modern %autosetup macro. - -------------------------------------------------------------------- -Thu May 7 08:38:39 UTC 2020 - Peter Simons - -- Update Cabal file to get more accurate dependency information. - ------------------------------------------------------------------- Fri Nov 8 16:13:40 UTC 2019 - Peter Simons diff --git a/ghc-either.spec b/ghc-either.spec index 3d34331..18b47e2 100644 --- a/ghc-either.spec +++ b/ghc-either.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-either # -# 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 @@ -25,7 +25,6 @@ Summary: Combinators for working with sums 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-bifunctors-devel BuildRequires: ghc-mtl-devel @@ -52,8 +51,7 @@ Requires(postun): ghc-compiler = %{ghc_version} This package provides the Haskell %{pkg_name} library development files. %prep -%autosetup -n %{pkg_name}-%{version} -cp -p %{SOURCE1} %{pkg_name}.cabal +%setup -q -n %{pkg_name}-%{version} %build %ghc_lib_build From 440639d8d12b30c8f8d896e4ffcc218c02a4c067fd04d4a807ba48cf3c236047 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Sep 2020 15:10:28 +0000 Subject: [PATCH 3/3] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-either revision:5, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-either?expand=0&rev=57 --- either.cabal | 70 ++++++++++++++++++++++++++++++++++++++++++++++ ghc-either.changes | 16 +++++++++++ ghc-either.spec | 6 ++-- 3 files changed, 90 insertions(+), 2 deletions(-) create mode 100644 either.cabal diff --git a/either.cabal b/either.cabal new file mode 100644 index 0000000..c494ebf --- /dev/null +++ b/either.cabal @@ -0,0 +1,70 @@ +name: either +category: Control, Monads +version: 5.0.1.1 +x-revision: 1 +license: BSD3 +cabal-version: >= 1.10 +license-file: LICENSE +author: Edward A. Kmett +maintainer: Edward A. Kmett +stability: provisional +homepage: http://github.com/ekmett/either/ +bug-reports: http://github.com/ekmett/either/issues +copyright: Copyright (C) 2008-2017 Edward A. Kmett +synopsis: Combinators for working with sums +description: Combinators for working with sums. +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.2 + , GHC == 8.2.2 + , GHC == 8.4.4 + , GHC == 8.6.5 + , GHC == 8.8.1 +extra-source-files: + .gitignore + .ghci + .vim.custom + .travis.yml + CHANGELOG.markdown + README.markdown + +source-repository head + type: git + location: git://github.com/ekmett/either.git + +library + build-depends: + base >= 4 && < 5, + bifunctors >= 4 && < 6, + mtl >= 2.0 && < 2.3, + profunctors >= 4 && < 6, + semigroupoids >= 4 && < 6 + + if !impl(ghc >= 8.0) + build-depends: semigroups >= 0.8.3.1 && < 1 + + other-extensions: CPP Rank2Types + ghc-options: -Wall + hs-source-dirs: src + default-language: Haskell2010 + exposed-modules: + Data.Either.Combinators + Data.Either.Validation + +test-suite tests + ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N + type: exitcode-stdio-1.0 + main-is: Main.hs + hs-source-dirs: tests + build-depends: + base, + either, + test-framework >= 0.8.1.1 && < 0.9, + test-framework-quickcheck2 >= 0.3.0.3 && < 0.4, + QuickCheck >= 2.9 && < 2.15 + default-language: Haskell2010 diff --git a/ghc-either.changes b/ghc-either.changes index 774abaf..ed350ea 100644 --- a/ghc-either.changes +++ b/ghc-either.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Mon Aug 31 09:34:31 UTC 2020 - psimons@suse.com + +- Update either to version 5.0.1.1 revision 1. + Upstream has revised the Cabal build instructions on Hackage. + +------------------------------------------------------------------- +Tue Aug 18 10:44:44 UTC 2020 - Peter Simons + +- Replace %setup -q with the more modern %autosetup macro. + +------------------------------------------------------------------- +Thu May 7 08:38:39 UTC 2020 - Peter Simons + +- Update Cabal file to get more accurate dependency information. + ------------------------------------------------------------------- Fri Nov 8 16:13:40 UTC 2019 - Peter Simons diff --git a/ghc-either.spec b/ghc-either.spec index 18b47e2..3d34331 100644 --- a/ghc-either.spec +++ b/ghc-either.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-either # -# 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 @@ -25,6 +25,7 @@ Summary: Combinators for working with sums 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-bifunctors-devel BuildRequires: ghc-mtl-devel @@ -51,7 +52,8 @@ 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} +cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build