From 13518b14fe5da02e8568349c2affef2e60a40c0b3aabe33702e543d16270d2a4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 27 Jun 2018 01:01:27 +0000 Subject: [PATCH 1/4] osc copypac from project:devel:languages:haskell:ghc-8.4.x package:ghc-distributive revision:6, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-distributive?expand=0&rev=27 --- distributive.cabal | 4 ++-- ghc-distributive.spec | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/distributive.cabal b/distributive.cabal index cbe820a..6aa1130 100644 --- a/distributive.cabal +++ b/distributive.cabal @@ -1,7 +1,7 @@ name: distributive category: Data Structures version: 0.5.3 -x-revision: 5 +x-revision: 6 license: BSD3 cabal-version: >= 1.8 license-file: LICENSE @@ -87,7 +87,7 @@ test-suite doctests build-depends: base >= 4, distributive, - doctest >= 0.11.1 && <0.16 + doctest >= 0.11.1 && <0.17 ghc-options: -Wall -threaded hs-source-dirs: tests diff --git a/ghc-distributive.spec b/ghc-distributive.spec index 655aa77..624c021 100644 --- a/ghc-distributive.spec +++ b/ghc-distributive.spec @@ -26,7 +26,7 @@ License: BSD-2-Clause Group: Development/Libraries/Haskell 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/5.cabal#/%{pkg_name}.cabal +Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/6.cabal#/%{pkg_name}.cabal BuildRequires: ghc-Cabal-devel BuildRequires: ghc-base-orphans-devel BuildRequires: ghc-cabal-doctest-devel From 242b1890cb09657b4ee627285cdec4c7d06de2d0db0be43af7b51e0e2b75c240 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 11 Jul 2018 01:01:36 +0000 Subject: [PATCH 2/4] osc copypac from project:devel:languages:haskell:ghc-8.4.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=28 --- distributive-0.5.3.tar.gz | 3 -- distributive-0.6.tar.gz | 3 ++ distributive.cabal | 107 -------------------------------------- ghc-distributive.changes | 11 ++++ ghc-distributive.spec | 7 +-- 5 files changed, 16 insertions(+), 115 deletions(-) delete mode 100644 distributive-0.5.3.tar.gz create mode 100644 distributive-0.6.tar.gz delete mode 100644 distributive.cabal diff --git a/distributive-0.5.3.tar.gz b/distributive-0.5.3.tar.gz deleted file mode 100644 index cd0c7fd..0000000 --- a/distributive-0.5.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9173805b9c941bda1f37e5aeb68ae30f57a12df9b17bd2aa86db3b7d5236a678 -size 10147 diff --git a/distributive-0.6.tar.gz b/distributive-0.6.tar.gz new file mode 100644 index 0000000..484789d --- /dev/null +++ b/distributive-0.6.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a4af1341a63a430dc569dd1e59631f127c40ebdd353a945a74d18682f6bdc1d4 +size 10904 diff --git a/distributive.cabal b/distributive.cabal deleted file mode 100644 index 6aa1130..0000000 --- a/distributive.cabal +++ /dev/null @@ -1,107 +0,0 @@ -name: distributive -category: Data Structures -version: 0.5.3 -x-revision: 6 -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 -extra-source-files: - .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.2 && < 0.6, - 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) - -- we need Functor Semi.Min etc. - 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.17 - ghc-options: -Wall -threaded - hs-source-dirs: tests - -test-suite spec - type: exitcode-stdio-1.0 - hs-source-dirs: tests - - 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 9bcedbb..466206c 100644 --- a/ghc-distributive.changes +++ b/ghc-distributive.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Jul 9 19:45:05 UTC 2018 - psimons@suse.com + +- Update distributive to version 0.6. + 0.6 [2018.07.02] + ---------------- + * Remove `fmapCollect`. (See + [here](https://github.com/ekmett/distributive/commit/1020655f15714514048d0dc842ffe4adcec89a7b) + for an explanation of why it was removed.) + * Avoid incurring some dependencies when using recent GHCs. + ------------------------------------------------------------------- Mon May 14 17:02:11 UTC 2018 - psimons@suse.com diff --git a/ghc-distributive.spec b/ghc-distributive.spec index 624c021..f1df3de 100644 --- a/ghc-distributive.spec +++ b/ghc-distributive.spec @@ -19,20 +19,18 @@ %global pkg_name distributive %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.5.3 +Version: 0.6 Release: 0 Summary: Distributive functors -- Dual to Traversable License: BSD-2-Clause Group: Development/Libraries/Haskell 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/6.cabal#/%{pkg_name}.cabal BuildRequires: ghc-Cabal-devel BuildRequires: ghc-base-orphans-devel BuildRequires: ghc-cabal-doctest-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-tagged-devel -BuildRequires: ghc-transformers-compat-devel BuildRequires: ghc-transformers-devel %if %{with tests} BuildRequires: ghc-doctest-devel @@ -41,7 +39,7 @@ BuildRequires: ghc-hspec-devel %endif %description -Distributive functors -- Dual to Traversable. +Distributive functors -- Dual to 'Traversable'. %package devel Summary: Haskell %{pkg_name} library development files @@ -56,7 +54,6 @@ This package provides the Haskell %{pkg_name} library development files. %prep %setup -q -n %{pkg_name}-%{version} -cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build From 4d75d19299394f784551f65b172ccf86d9be9ebcdbea2a79543ac0d435cac9ab Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 15 Jul 2018 01:01:42 +0000 Subject: [PATCH 3/4] osc copypac from project:devel:languages:haskell:ghc-8.4.x package:ghc-distributive revision:8, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-distributive?expand=0&rev=29 --- ghc-distributive.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-distributive.changes b/ghc-distributive.changes index 466206c..f9b4610 100644 --- a/ghc-distributive.changes +++ b/ghc-distributive.changes @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Mon Jul 9 19:45:05 UTC 2018 - psimons@suse.com +Fri Jul 13 14:31:36 UTC 2018 - psimons@suse.com - Update distributive to version 0.6. 0.6 [2018.07.02] From 7ccfeec3e513dc76131caad5caaf311cfd72d4d4a6f0a09eaeb3b2a9270725da Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Jul 2018 14:40:11 +0000 Subject: [PATCH 4/4] osc copypac from project:devel:languages:haskell:ghc-8.4.x package:ghc-distributive revision:9, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-distributive?expand=0&rev=30 --- ghc-distributive.changes | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/ghc-distributive.changes b/ghc-distributive.changes index f9b4610..75f18d6 100644 --- a/ghc-distributive.changes +++ b/ghc-distributive.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jul 18 14:26:21 UTC 2018 - psimons@suse.com + +- Cosmetic: replace tabs with blanks, strip trailing white space, + and update copyright headers with spec-cleaner. + ------------------------------------------------------------------- Fri Jul 13 14:31:36 UTC 2018 - psimons@suse.com @@ -50,10 +56,9 @@ Tue Jan 26 08:40:30 UTC 2016 - mimi.vx@gmail.com ------------------------------------------------------------------- Thu May 21 06:41:23 UTC 2015 - mimi.vx@gmail.com -- correct licence to BSD-2-Clause +- correct licence to BSD-2-Clause ------------------------------------------------------------------- Sun Apr 26 16:43:29 UTC 2015 - mimi.vx@gmail.com -- initial commit - +- initial commit