Hello community,
here is the log from the commit of package ghc-sets for openSUSE:Factory checked in at 2017-05-10 20:48:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-sets (Old)
and /work/SRC/openSUSE:Factory/.ghc-sets.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-sets"
Wed May 10 20:48:41 2017 rev:2 rq:489366 version:0.0.5.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/ghc-sets/ghc-sets.changes 2017-04-12 17:12:36.229943744 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-sets.new/ghc-sets.changes 2017-05-10 20:48:45.209782490 +0200
@@ -1,0 +2,5 @@
+Mon Sep 26 06:52:16 UTC 2016 - psimons@suse.com
+
+- Update to version 0.0.5.2 with cabal2obs.
+
+-------------------------------------------------------------------
Old:
----
1.cabal
sets-0.0.5.tar.gz
New:
----
sets-0.0.5.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-sets.spec ++++++
--- /var/tmp/diff_new_pack.On7k0d/_old 2017-05-10 20:48:51.356915087 +0200
+++ /var/tmp/diff_new_pack.On7k0d/_new 2017-05-10 20:48:51.360914523 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ghc-sets
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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,23 +19,20 @@
%global pkg_name sets
%bcond_with tests
Name: ghc-%{pkg_name}
-Version: 0.0.5
+Version: 0.0.5.2
Release: 0
-Summary: Various set implementations in Haskell
+Summary: Ducktyped set interface for Haskell containers
License: MIT
-Group: System/Libraries
+Group: Development/Languages/Other
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
BuildRequires: ghc-Cabal-devel
-# Begin cabal-rpm deps:
BuildRequires: ghc-QuickCheck-devel
BuildRequires: ghc-commutative-devel
BuildRequires: ghc-composition-devel
BuildRequires: ghc-containers-devel
BuildRequires: ghc-contravariant-devel
BuildRequires: ghc-hashable-devel
-BuildRequires: ghc-invariant-devel
BuildRequires: ghc-keys-devel
BuildRequires: ghc-mtl-devel
BuildRequires: ghc-rpm-macros
@@ -52,11 +49,9 @@
BuildRequires: ghc-tasty-hunit-devel
BuildRequires: ghc-tasty-quickcheck-devel
%endif
-# End cabal-rpm deps
%description
-This also includes overloaded functions for common set operations. See
-'Data.Set.Class'.
+Includes overloaded functions for common set operations. See 'Data.Set.Class'.
%package devel
Summary: Haskell %{pkg_name} library development files
@@ -71,24 +66,15 @@
%prep
%setup -q -n %{pkg_name}-%{version}
-cp -p %{SOURCE1} %{pkg_name}.cabal
-echo > Setup.hs 'import Distribution.Simple'
-echo >>Setup.hs 'main = defaultMain'
-
%build
%ghc_lib_build
-
%install
%ghc_lib_install
-
%check
-%if %{with tests}
-%{cabal} test
-%endif
-
+%cabal_test
%post devel
%ghc_pkg_recache
++++++ sets-0.0.5.tar.gz -> sets-0.0.5.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sets-0.0.5/Setup.hs new/sets-0.0.5.2/Setup.hs
--- old/sets-0.0.5/Setup.hs 1970-01-01 01:00:00.000000000 +0100
+++ new/sets-0.0.5.2/Setup.hs 2016-09-17 00:53:11.000000000 +0200
@@ -0,0 +1,2 @@
+import Distribution.Simple
+main = defaultMain
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sets-0.0.5/sets.cabal new/sets-0.0.5.2/sets.cabal
--- old/sets-0.0.5/sets.cabal 2015-09-06 21:42:50.000000000 +0200
+++ new/sets-0.0.5.2/sets.cabal 2016-09-17 01:36:46.000000000 +0200
@@ -1,11 +1,11 @@
Name: sets
-Version: 0.0.5
+Version: 0.0.5.2
Author: Athan Clark
Maintainer: Athan Clark
License: MIT
License-File: LICENSE
-Synopsis: Various set implementations in Haskell.
-Description: This also includes overloaded functions for common set operations. See @Data.Set.Class@.
+Synopsis: Ducktyped set interface for Haskell containers.
+Description: Includes overloaded functions for common set operations. See @Data.Set.Class@.
Cabal-Version: >= 1.10
Build-Type: Simple
Category: Data, Math
@@ -29,7 +29,7 @@
, commutative >= 0.0.1.4
, composition
, contravariant
- , invariant
+-- , invariant
, witherable
, keys
, semigroups
@@ -42,19 +42,12 @@
Test-Suite spec
Type: exitcode-stdio-1.0
Default-Language: Haskell2010
- Hs-Source-Dirs: src
- , test
+ Hs-Source-Dirs: test
Ghc-Options: -Wall -threaded
Main-Is: Main.hs
Other-Modules: Data.SetSpec
- Data.Set.Class
- Data.Set.Ordered.Many
- Data.Set.Ordered.Many.With
- Data.Set.Ordered.Unique.Finite
- Data.Set.Ordered.Unique.With
- Data.Set.Unordered.Many
- Data.Set.Unordered.Unique
Build-Depends: base
+ , sets
, tasty
, tasty-quickcheck
, tasty-hunit
@@ -62,34 +55,17 @@
, quickcheck-instances
, containers
, unordered-containers
- , hashable
- , commutative
- , composition
, contravariant
- , semigroups
- , semigroupoids
- , keys
- , invariant
- , witherable
- , mtl
- , transformers
- , transformers-base
+ , commutative
Benchmark bench
Type: exitcode-stdio-1.0
Default-Language: Haskell2010
- Hs-Source-Dirs: src
- , bench
+ Hs-Source-Dirs: bench
Ghc-Options: -Wall -threaded
Main-Is: Profile.hs
- Other-Modules: Data.Set.Class
- Data.Set.Ordered.Many
- Data.Set.Ordered.Unique.Finite
- Data.Set.Ordered.Unique.With
- Data.Set.Unordered.Many
- Data.Set.Unordered.Unique
- Data.Set.Data
+ Other-Modules: Data.Set.Data
Data.Map.Data
Data.IntSet.Data
Data.IntMap.Data
@@ -97,21 +73,11 @@
Data.Set.Unordered.Many.Data
Data.Set.Unordered.Unique.Data
Build-Depends: base
- , QuickCheck
+ , sets
, containers
, unordered-containers
- , hashable
, commutative
- , composition
, contravariant
- , invariant
- , witherable
- , semigroups
- , semigroupoids
- , keys
- , mtl
- , transformers
- , transformers-base
, criterion
Source-Repository head
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sets-0.0.5/src/Data/Set/Class.hs new/sets-0.0.5.2/src/Data/Set/Class.hs
--- old/sets-0.0.5/src/Data/Set/Class.hs 2015-09-06 05:26:21.000000000 +0200
+++ new/sets-0.0.5.2/src/Data/Set/Class.hs 2016-09-17 00:45:02.000000000 +0200
@@ -23,7 +23,6 @@
import Data.Traversable
import Data.Semigroup.Foldable as Fold1
import Data.Semigroup
-import Data.Monoid as Monoid
import Data.Key
import Data.Commutative as Comm
import Data.Composition
@@ -148,7 +147,8 @@
instance (HasUnion s, HasIntersection s, HasDifference s) => HasXUnion s where
xunion x y = union x y `difference` intersection x y
-instance (HasXUnion s, HasUnion s, HasIntersection s, HasDifference s) => Commutative (XUnion s) where
+instance ( HasXUnion s, HasUnion s
+ , HasIntersection s, HasDifference s) => Commutative (XUnion s) where
commute = xunion
instance (HasXUnion s, HasEmpty s, HasUnion s, HasIntersection s, HasDifference s) => Monoid (XUnion s) where
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sets-0.0.5/src/Data/Set/Ordered/Many/With.hs new/sets-0.0.5.2/src/Data/Set/Ordered/Many/With.hs
--- old/sets-0.0.5/src/Data/Set/Ordered/Many/With.hs 2015-09-07 19:41:03.000000000 +0200
+++ new/sets-0.0.5.2/src/Data/Set/Ordered/Many/With.hs 2016-09-17 00:46:08.000000000 +0200
@@ -18,15 +18,15 @@
import Data.Monoid
import Data.Maybe (isJust)
-import Data.Functor.Invariant
+--import Data.Functor.Invariant
import Data.Foldable as Fold hiding (and)
import Control.Applicative hiding (empty)
newtype SetsWith k c a = SetsWith {unSetsWith :: (a -> k, Map.Map k (c a))}
-instance Functor c => Invariant (SetsWith k c) where
- invmap = map
+--instance Functor c => Invariant (SetsWith k c) where
+-- invmap = map
instance Fold.Foldable c => Fold.Foldable (SetsWith k c) where
foldr = Data.Set.Ordered.Many.With.foldr
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sets-0.0.5/src/Data/Set/Ordered/Unique/Finite.hs new/sets-0.0.5.2/src/Data/Set/Ordered/Unique/Finite.hs
--- old/sets-0.0.5/src/Data/Set/Ordered/Unique/Finite.hs 2015-08-16 07:56:16.000000000 +0200
+++ new/sets-0.0.5.2/src/Data/Set/Ordered/Unique/Finite.hs 2016-09-17 00:39:38.000000000 +0200
@@ -16,7 +16,7 @@
-- * Query
-- | /O(1)/
-null :: Eq a => FiniteSet a -> Bool
+null :: FiniteSet a -> Bool
null (FiniteSet (_,xs)) = Set.null xs
-- | /O(1)/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sets-0.0.5/src/Data/Set/Ordered/Unique/With.hs new/sets-0.0.5.2/src/Data/Set/Ordered/Unique/With.hs
--- old/sets-0.0.5/src/Data/Set/Ordered/Unique/With.hs 2015-09-06 21:44:48.000000000 +0200
+++ new/sets-0.0.5.2/src/Data/Set/Ordered/Unique/With.hs 2016-09-17 00:45:37.000000000 +0200
@@ -13,12 +13,13 @@
module Data.Set.Ordered.Unique.With where
-import Prelude (Show, String, Eq, Ord, Bool, Int, Maybe, fmap, not, fst, snd, zip, (.), ($), foldr)
+import Prelude ( Show, String, Eq, Ord, Bool, Int, Maybe
+ , fmap, not, fst, snd, zip, (.), ($), foldr)
import qualified Data.Map as Map
import qualified Data.List as List
import Data.Maybe (isJust)
import qualified Data.Foldable as Fold
-import Data.Functor.Invariant
+--import Data.Functor.Invariant
import Control.Applicative ((<$>))
import Data.Monoid (Monoid)
@@ -26,8 +27,8 @@
newtype SetWith k a = SetWith {unSetWith :: (a -> k, Map.Map k a)}
deriving (Monoid)
-instance Invariant (SetWith k) where
- invmap = map
+--instance Invariant (SetWith k) where
+-- invmap = map
instance Fold.Foldable (SetWith k) where
foldr = Data.Set.Ordered.Unique.With.foldr
@@ -115,7 +116,7 @@
splitMember x (SetWith (f,xs)) = let (l,b,r) = Map.splitLookup (f x) xs
in (SetWith (f,l), isJust b, SetWith (f,r))
-splitRoot :: Ord k => SetWith k a -> [SetWith k a]
+splitRoot :: SetWith k a -> [SetWith k a]
splitRoot (SetWith (f,xs)) = let xss = Map.splitRoot xs
in fmap (\a -> SetWith (f,a)) xss
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sets-0.0.5/src/Data/Set/Unordered/Many.hs new/sets-0.0.5.2/src/Data/Set/Unordered/Many.hs
--- old/sets-0.0.5/src/Data/Set/Unordered/Many.hs 2015-09-07 19:25:30.000000000 +0200
+++ new/sets-0.0.5.2/src/Data/Set/Unordered/Many.hs 2016-09-17 00:43:07.000000000 +0200
@@ -8,8 +8,7 @@
import Data.Mergeable
import Data.List as List hiding (delete)
import qualified Data.List as List
-import Data.Maybe (fromJust, isJust, mapMaybe)
-import Control.Applicative
+import Data.Maybe (mapMaybe)
import Control.Monad
import Test.QuickCheck
@@ -51,7 +50,7 @@
-- * Query
-- | /O(1)/
-null :: Eq a => UMSet a -> Bool
+null :: UMSet a -> Bool
null (UMSet xs) = List.null xs
-- | /O(n)/
@@ -68,11 +67,11 @@
-- | /O(n)/
lookup :: Eq a => a -> UMSet a -> Maybe a
-lookup x (UMSet xs) = lookup' x xs
+lookup x (UMSet xs) = lookup' xs
where
- lookup' _ [] = Nothing
- lookup' x (y:ys) | x == y = Just y
- | otherwise = lookup' x ys
+ lookup' [] = Nothing
+ lookup' (y:ys) | x == y = Just y
+ | otherwise = lookup' ys
-- | /O(n*m)/
isSubsetOf :: Eq a => UMSet a -> UMSet a -> Bool
@@ -112,7 +111,7 @@
-- * Combine
-- | /O(n)/
-union :: Eq a => UMSet a -> UMSet a -> UMSet a
+union :: UMSet a -> UMSet a -> UMSet a
union (UMSet xs) (UMSet ys) = UMSet $ xs ++ ys
-- | /O(n*m)/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sets-0.0.5/src/Data/Set/Unordered/Unique.hs new/sets-0.0.5.2/src/Data/Set/Unordered/Unique.hs
--- old/sets-0.0.5/src/Data/Set/Unordered/Unique.hs 2015-09-07 19:37:13.000000000 +0200
+++ new/sets-0.0.5.2/src/Data/Set/Unordered/Unique.hs 2016-09-17 00:40:48.000000000 +0200
@@ -16,7 +16,6 @@
import Data.Maybe (fromJust, isJust, mapMaybe)
import Control.Monad.State
import Control.Monad.Base
-import Control.Applicative
import Test.QuickCheck
@@ -63,7 +62,7 @@
-- * Query
-- | /O(1)/
-null :: Eq a => UUSet a -> Bool
+null :: UUSet a -> Bool
null (UUSet xs) = List.null xs
-- | /O(n)/
