From aee385b70cb6e537a998b8d0dbf9f1e4d42778d8fb77eaf0b48faa9133ad03bd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 1 Sep 2020 01:01:35 +0000 Subject: [PATCH 1/3] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-distributive revision:10, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-distributive?expand=0&rev=51 --- ghc-distributive.changes | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ghc-distributive.changes b/ghc-distributive.changes index 4ad0b25..cea2134 100644 --- a/ghc-distributive.changes +++ b/ghc-distributive.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Aug 31 09:34:32 UTC 2020 - psimons@suse.com + +- Update distributive to version 0.6.2 revision 2. + Upstream has revised the Cabal build instructions on Hackage. + ------------------------------------------------------------------- Tue Aug 18 10:44:40 UTC 2020 - Peter Simons From a547239df6da43913ce3e6d2ccd5de0650246b481f7bc48f1eb1aa8effc31019 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Sep 2020 15:03:15 +0000 Subject: [PATCH 2/3] osc copypac from project:devel:languages:haskell:ghc-8.6.x package:ghc-distributive revision:7, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-distributive?expand=0&rev=52 --- distributive-0.6.1.tar.gz | 3 + distributive-0.6.2.tar.gz | 3 - distributive.cabal | 122 -------------------------------------- ghc-distributive.changes | 24 -------- ghc-distributive.spec | 8 +-- 5 files changed, 6 insertions(+), 154 deletions(-) create mode 100644 distributive-0.6.1.tar.gz delete mode 100644 distributive-0.6.2.tar.gz delete mode 100644 distributive.cabal diff --git a/distributive-0.6.1.tar.gz b/distributive-0.6.1.tar.gz new file mode 100644 index 0000000..f71b082 --- /dev/null +++ b/distributive-0.6.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7749b1d9b815e3ba558d1daebac9346610e352bb0dfe9720cc686eb2fef7caf2 +size 11256 diff --git a/distributive-0.6.2.tar.gz b/distributive-0.6.2.tar.gz deleted file mode 100644 index d2ea241..0000000 --- a/distributive-0.6.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:824ee271ded433ce6c61fe890c784642b7e20ffa4082fca609da54e7dcfc23c9 -size 11308 diff --git a/distributive.cabal b/distributive.cabal deleted file mode 100644 index f53f38e..0000000 --- a/distributive.cabal +++ /dev/null @@ -1,122 +0,0 @@ -name: distributive -category: Data Structures -version: 0.6.2 -x-revision: 2 -license: BSD3 -cabal-version: >= 1.8 -license-file: LICENSE -author: Edward A. Kmett -maintainer: Edward A. Kmett -stability: provisional -homepage: http://github.com/ekmett/distributive/ -bug-reports: http://github.com/ekmett/distributive/issues -copyright: Copyright (C) 2011-2016 Edward A. Kmett -synopsis: Distributive functors -- Dual to Traversable -description: Distributive functors -- Dual to @Traversable@ -build-type: Custom -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: - .hlint.yaml - .travis.yml - .vim.custom - config - travis-cabal-apt-install - CHANGELOG.markdown - README.markdown - Warning.hs - -source-repository head - type: git - location: git://github.com/ekmett/distributive.git - -custom-setup - setup-depends: - base >= 4 && <5, - Cabal, - cabal-doctest >= 1 && <1.1 - -flag semigroups - manual: True - default: True - description: - You can disable the use of the `semigroups` package using `-f-semigroups`. - . - Disabling this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users. - -flag tagged - manual: True - default: True - description: - You can disable the use of the `tagged` package using `-f-tagged`. - . - Disabling this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users. - -library - build-depends: - base >= 4 && < 5, - base-orphans >= 0.5.2 && < 1, - transformers >= 0.3 && < 0.6 - - if !impl(ghc >= 7.8) && !impl(ghcjs) - build-depends: transformers-compat >= 0.3 && < 1 - - hs-source-dirs: src - exposed-modules: - Data.Distributive - - if impl(ghc>=7.2) - exposed-modules: Data.Distributive.Generic - - if flag(tagged) - build-depends: tagged >= 0.7 && < 1 - - if impl(ghc>=7.2 && < 7.6) - build-depends: ghc-prim - - if impl(ghc < 8.0) - if flag(semigroups) - build-depends: semigroups >= 0.13 && < 1 - - if impl(ghc < 7.8) - hs-source-dirs: src-compat - other-modules: Data.Coerce - - ghc-options: -Wall - --- Verify the results of the examples -test-suite doctests - type: exitcode-stdio-1.0 - main-is: doctests.hs - build-depends: - base >= 4, - distributive, - doctest >= 0.11.1 && <0.18 - ghc-options: -Wall -threaded - hs-source-dirs: tests - -test-suite spec - type: exitcode-stdio-1.0 - hs-source-dirs: tests - build-tool-depends: - hspec-discover:hspec-discover - - build-depends: - base >= 4 && < 5, - distributive, - generic-deriving >= 1.11 && < 2, - hspec >= 2 && < 3 - - main-is: Spec.hs - other-modules: GenericsSpec - - ghc-options: -Wall -threaded -rtsopts diff --git a/ghc-distributive.changes b/ghc-distributive.changes index cea2134..0dd971d 100644 --- a/ghc-distributive.changes +++ b/ghc-distributive.changes @@ -1,27 +1,3 @@ -------------------------------------------------------------------- -Mon Aug 31 09:34:32 UTC 2020 - psimons@suse.com - -- Update distributive to version 0.6.2 revision 2. - Upstream has revised the Cabal build instructions on Hackage. - -------------------------------------------------------------------- -Tue Aug 18 10:44:40 UTC 2020 - Peter Simons - -- Replace %setup -q with the more modern %autosetup macro. - -------------------------------------------------------------------- -Tue Jun 16 11:14:02 UTC 2020 - Peter Simons - -- Re-generate file with latest version of spec-cleaner. - -------------------------------------------------------------------- -Wed May 6 06:54:11 UTC 2020 - psimons@suse.com - -- Update distributive to version 0.6.2. - 0.6.2 [2020.04.10] - ------------------ - * Make the `Distributive` instance for `Tagged` poly-kinded. - ------------------------------------------------------------------- Fri Nov 8 16:13:37 UTC 2019 - Peter Simons diff --git a/ghc-distributive.spec b/ghc-distributive.spec index 15c9410..7d310d8 100644 --- a/ghc-distributive.spec +++ b/ghc-distributive.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-distributive # -# 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,13 +19,12 @@ %global pkg_name distributive %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.6.2 +Version: 0.6.1 Release: 0 Summary: Distributive functors -- Dual to Traversable License: BSD-2-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/2.cabal#/%{pkg_name}.cabal BuildRequires: ghc-Cabal-devel BuildRequires: ghc-base-orphans-devel BuildRequires: ghc-cabal-doctest-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 a51f189401e8030a6813825798c719adb833f610422f1aac5158e27baeb0d153 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Sep 2020 15:10:24 +0000 Subject: [PATCH 3/3] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-distributive revision:10, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-distributive?expand=0&rev=53 --- distributive-0.6.1.tar.gz | 3 - distributive-0.6.2.tar.gz | 3 + distributive.cabal | 122 ++++++++++++++++++++++++++++++++++++++ ghc-distributive.changes | 24 ++++++++ ghc-distributive.spec | 8 ++- 5 files changed, 154 insertions(+), 6 deletions(-) delete mode 100644 distributive-0.6.1.tar.gz create mode 100644 distributive-0.6.2.tar.gz create mode 100644 distributive.cabal diff --git a/distributive-0.6.1.tar.gz b/distributive-0.6.1.tar.gz deleted file mode 100644 index f71b082..0000000 --- a/distributive-0.6.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7749b1d9b815e3ba558d1daebac9346610e352bb0dfe9720cc686eb2fef7caf2 -size 11256 diff --git a/distributive-0.6.2.tar.gz b/distributive-0.6.2.tar.gz new file mode 100644 index 0000000..d2ea241 --- /dev/null +++ b/distributive-0.6.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:824ee271ded433ce6c61fe890c784642b7e20ffa4082fca609da54e7dcfc23c9 +size 11308 diff --git a/distributive.cabal b/distributive.cabal new file mode 100644 index 0000000..f53f38e --- /dev/null +++ b/distributive.cabal @@ -0,0 +1,122 @@ +name: distributive +category: Data Structures +version: 0.6.2 +x-revision: 2 +license: BSD3 +cabal-version: >= 1.8 +license-file: LICENSE +author: Edward A. Kmett +maintainer: Edward A. Kmett +stability: provisional +homepage: http://github.com/ekmett/distributive/ +bug-reports: http://github.com/ekmett/distributive/issues +copyright: Copyright (C) 2011-2016 Edward A. Kmett +synopsis: Distributive functors -- Dual to Traversable +description: Distributive functors -- Dual to @Traversable@ +build-type: Custom +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: + .hlint.yaml + .travis.yml + .vim.custom + config + travis-cabal-apt-install + CHANGELOG.markdown + README.markdown + Warning.hs + +source-repository head + type: git + location: git://github.com/ekmett/distributive.git + +custom-setup + setup-depends: + base >= 4 && <5, + Cabal, + cabal-doctest >= 1 && <1.1 + +flag semigroups + manual: True + default: True + description: + You can disable the use of the `semigroups` package using `-f-semigroups`. + . + Disabling this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users. + +flag tagged + manual: True + default: True + description: + You can disable the use of the `tagged` package using `-f-tagged`. + . + Disabling this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users. + +library + build-depends: + base >= 4 && < 5, + base-orphans >= 0.5.2 && < 1, + transformers >= 0.3 && < 0.6 + + if !impl(ghc >= 7.8) && !impl(ghcjs) + build-depends: transformers-compat >= 0.3 && < 1 + + hs-source-dirs: src + exposed-modules: + Data.Distributive + + if impl(ghc>=7.2) + exposed-modules: Data.Distributive.Generic + + if flag(tagged) + build-depends: tagged >= 0.7 && < 1 + + if impl(ghc>=7.2 && < 7.6) + build-depends: ghc-prim + + if impl(ghc < 8.0) + if flag(semigroups) + build-depends: semigroups >= 0.13 && < 1 + + if impl(ghc < 7.8) + hs-source-dirs: src-compat + other-modules: Data.Coerce + + ghc-options: -Wall + +-- Verify the results of the examples +test-suite doctests + type: exitcode-stdio-1.0 + main-is: doctests.hs + build-depends: + base >= 4, + distributive, + doctest >= 0.11.1 && <0.18 + ghc-options: -Wall -threaded + hs-source-dirs: tests + +test-suite spec + type: exitcode-stdio-1.0 + hs-source-dirs: tests + build-tool-depends: + hspec-discover:hspec-discover + + build-depends: + base >= 4 && < 5, + distributive, + generic-deriving >= 1.11 && < 2, + hspec >= 2 && < 3 + + main-is: Spec.hs + other-modules: GenericsSpec + + ghc-options: -Wall -threaded -rtsopts diff --git a/ghc-distributive.changes b/ghc-distributive.changes index 0dd971d..cea2134 100644 --- a/ghc-distributive.changes +++ b/ghc-distributive.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Mon Aug 31 09:34:32 UTC 2020 - psimons@suse.com + +- Update distributive to version 0.6.2 revision 2. + Upstream has revised the Cabal build instructions on Hackage. + +------------------------------------------------------------------- +Tue Aug 18 10:44:40 UTC 2020 - Peter Simons + +- Replace %setup -q with the more modern %autosetup macro. + +------------------------------------------------------------------- +Tue Jun 16 11:14:02 UTC 2020 - Peter Simons + +- Re-generate file with latest version of spec-cleaner. + +------------------------------------------------------------------- +Wed May 6 06:54:11 UTC 2020 - psimons@suse.com + +- Update distributive to version 0.6.2. + 0.6.2 [2020.04.10] + ------------------ + * Make the `Distributive` instance for `Tagged` poly-kinded. + ------------------------------------------------------------------- Fri Nov 8 16:13:37 UTC 2019 - Peter Simons diff --git a/ghc-distributive.spec b/ghc-distributive.spec index 7d310d8..15c9410 100644 --- a/ghc-distributive.spec +++ b/ghc-distributive.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-distributive # -# 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,12 +19,13 @@ %global pkg_name distributive %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.6.1 +Version: 0.6.2 Release: 0 Summary: Distributive functors -- Dual to Traversable License: BSD-2-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/2.cabal#/%{pkg_name}.cabal BuildRequires: ghc-Cabal-devel BuildRequires: ghc-base-orphans-devel BuildRequires: ghc-cabal-doctest-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