From b3650960a2c93b82ab717bfbecfbad487d1df54f22cff5b3e7a3b5c7a7d0edae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Fri, 18 Dec 2020 12:51:51 +0000 Subject: [PATCH 1/3] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-comonad revision:12, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-comonad?expand=0&rev=54 --- comonad-5.0.6.tar.gz | 3 - comonad-5.0.7.tar.gz | 3 + comonad.cabal | 134 ------------------------------------------- ghc-comonad.changes | 14 +++++ ghc-comonad.spec | 11 +++- 5 files changed, 25 insertions(+), 140 deletions(-) delete mode 100644 comonad-5.0.6.tar.gz create mode 100644 comonad-5.0.7.tar.gz delete mode 100644 comonad.cabal diff --git a/comonad-5.0.6.tar.gz b/comonad-5.0.6.tar.gz deleted file mode 100644 index 4030a1a..0000000 --- a/comonad-5.0.6.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:77cfb016acd1747b892c31b82daf0de93f508ba775d62562d376b354adb88fae -size 18154 diff --git a/comonad-5.0.7.tar.gz b/comonad-5.0.7.tar.gz new file mode 100644 index 0000000..31cbfff --- /dev/null +++ b/comonad-5.0.7.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:55bdeba7b7d3c9e1385fd9e2e57f7a6faa3ab68411c8186d4ba6e7e2ce030d9d +size 18108 diff --git a/comonad.cabal b/comonad.cabal deleted file mode 100644 index c3664ec..0000000 --- a/comonad.cabal +++ /dev/null @@ -1,134 +0,0 @@ -name: comonad -category: Control, Comonads -version: 5.0.6 -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/comonad/ -bug-reports: http://github.com/ekmett/comonad/issues -copyright: Copyright (C) 2008-2014 Edward A. Kmett, - Copyright (C) 2004-2008 Dave Menendez -synopsis: Comonads -description: Comonads. -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: - .ghci - .gitignore - .hlint.yaml - .travis.yml - .vim.custom - coq/Store.v - README.markdown - CHANGELOG.markdown - examples/History.hs - Warning.hs - -custom-setup - setup-depends: - base >= 4 && < 5, - Cabal, - cabal-doctest >= 1 && < 1.1 - --- You can disable the doctests test suite with -f-test-doctests -flag test-doctests - default: True - manual: True - -flag containers - description: - You can disable the use of the `containers` package using `-f-containers`. - . - Disabing this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users. - default: True - manual: True - -flag distributive - description: - You can disable the use of the `distributive` package using `-f-distributive`. - . - Disabling this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users. - . - If disabled we will not supply instances of `Distributive` - . - default: True - manual: True - - -source-repository head - type: git - location: git://github.com/ekmett/comonad.git - -library - hs-source-dirs: src - default-language: Haskell2010 - ghc-options: -Wall - - build-depends: - base >= 4 && < 5, - tagged >= 0.7 && < 1, - transformers >= 0.2 && < 0.6, - transformers-compat >= 0.3 && < 1 - - if !impl(ghc >= 8.0) - build-depends: semigroups >= 0.16.2 && < 1 - - if flag(containers) - build-depends: containers >= 0.3 && < 0.7 - - if flag(distributive) - build-depends: distributive >= 0.2.2 && < 1 - - exposed-modules: - Control.Comonad - Control.Comonad.Env - Control.Comonad.Env.Class - Control.Comonad.Hoist.Class - Control.Comonad.Identity - Control.Comonad.Store - Control.Comonad.Store.Class - Control.Comonad.Traced - Control.Comonad.Traced.Class - Control.Comonad.Trans.Class - Control.Comonad.Trans.Env - Control.Comonad.Trans.Identity - Control.Comonad.Trans.Store - Control.Comonad.Trans.Traced - Data.Functor.Composition - - other-extensions: - CPP - RankNTypes - MultiParamTypeClasses - FunctionalDependencies - FlexibleInstances - UndecidableInstances - -test-suite doctests - type: exitcode-stdio-1.0 - default-language: Haskell2010 - main-is: doctests.hs - ghc-options: -Wall -threaded - hs-source-dirs: tests - - if !flag(test-doctests) - buildable: False - else - build-depends: - base, - comonad, - doctest >= 0.11.1 && < 0.18 diff --git a/ghc-comonad.changes b/ghc-comonad.changes index 4f4cc7e..be6c082 100644 --- a/ghc-comonad.changes +++ b/ghc-comonad.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Thu Oct 17 12:20:00 UTC 2020 - Ondřej Súkup + +- force i686 arch on i586 + +------------------------------------------------------------------- +Wed Dec 16 17:25:51 UTC 2020 - psimons@suse.com + +- Update comonad to version 5.0.7. + 5.0.7 [2020.12.15] + ------------------ + * Move `FunctorWithIndex (TracedT m w)` instance from `lens`. + This instance depends on the `indexed-traversable` package. This can be disabled using the flag of the same name. + ------------------------------------------------------------------- Mon Aug 31 09:34:36 UTC 2020 - psimons@suse.com diff --git a/ghc-comonad.spec b/ghc-comonad.spec index 99784eb..8a3e534 100644 --- a/ghc-comonad.spec +++ b/ghc-comonad.spec @@ -19,21 +19,27 @@ %global pkg_name comonad %bcond_with tests Name: ghc-%{pkg_name} -Version: 5.0.6 +Version: 5.0.7 Release: 0 Summary: Comonads 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/1.cabal#/%{pkg_name}.cabal BuildRequires: ghc-Cabal-devel BuildRequires: ghc-cabal-doctest-devel BuildRequires: ghc-containers-devel BuildRequires: ghc-distributive-devel +BuildRequires: ghc-indexed-traversable-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-tagged-devel BuildRequires: ghc-transformers-compat-devel BuildRequires: ghc-transformers-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-doctest-devel %endif @@ -53,7 +59,6 @@ This package provides the Haskell %{pkg_name} library development files. %prep %autosetup -n %{pkg_name}-%{version} -cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build From 29d061e6439eb64d9a4822d467dde19482b628ac8cf768bf9b2a5b6630a1b4b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 17:47:48 +0000 Subject: [PATCH 2/3] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-comonad revision:14, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-comonad?expand=0&rev=55 --- ghc-comonad.changes | 2 +- ghc-comonad.spec | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/ghc-comonad.changes b/ghc-comonad.changes index be6c082..e8a0957 100644 --- a/ghc-comonad.changes +++ b/ghc-comonad.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 ------------------------------------------------------------------- Wed Dec 16 17:25:51 UTC 2020 - psimons@suse.com diff --git a/ghc-comonad.spec b/ghc-comonad.spec index 8a3e534..a0cce0d 100644 --- a/ghc-comonad.spec +++ b/ghc-comonad.spec @@ -34,12 +34,7 @@ BuildRequires: ghc-rpm-macros BuildRequires: ghc-tagged-devel BuildRequires: ghc-transformers-compat-devel BuildRequires: ghc-transformers-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-doctest-devel %endif From 99c54681dce044232483cbefd34cf73f8c0d547ae097e26e9612a1910abb5b82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 18:28:16 +0000 Subject: [PATCH 3/3] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-comonad revision:15, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-comonad?expand=0&rev=56 --- ghc-comonad.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-comonad.changes b/ghc-comonad.changes index e8a0957..9e4f51c 100644 --- a/ghc-comonad.changes +++ b/ghc-comonad.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