Hello community,
here is the log from the commit of package ghc-regex-tdfa for openSUSE:Factory
checked in at 2018-07-24 17:21:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-regex-tdfa (Old)
and /work/SRC/openSUSE:Factory/.ghc-regex-tdfa.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-regex-tdfa"
Tue Jul 24 17:21:29 2018 rev:6 rq:623842 version:1.2.3.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/ghc-regex-tdfa/ghc-regex-tdfa.changes
2018-05-30 12:27:01.186873018 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-regex-tdfa.new/ghc-regex-tdfa.changes
2018-07-24 17:21:32.167234740 +0200
@@ -1,0 +2,14 @@
+Wed Jul 18 14:26:38 UTC 2018 - psim...@suse.com
+
+- Cosmetic: replace tabs with blanks, strip trailing white space,
+ and update copyright headers with spec-cleaner.
+
+-------------------------------------------------------------------
+Fri Jul 13 14:31:47 UTC 2018 - psim...@suse.com
+
+- Update regex-tdfa to version 1.2.3.1.
+ # 1.2.3.1
+
+ * Compatibility with `containers-0.6`.
+
+-------------------------------------------------------------------
@@ -40 +53,0 @@
-
Old:
----
regex-tdfa-1.2.3.tar.gz
New:
----
regex-tdfa-1.2.3.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-regex-tdfa.spec ++++++
--- /var/tmp/diff_new_pack.bY3gM2/_old 2018-07-24 17:21:32.919235703 +0200
+++ /var/tmp/diff_new_pack.bY3gM2/_new 2018-07-24 17:21:32.923235708 +0200
@@ -18,7 +18,7 @@
%global pkg_name regex-tdfa
Name: ghc-%{pkg_name}
-Version: 1.2.3
+Version: 1.2.3.1
Release: 0
Summary: Replaces/Enhances Text.Regex
License: BSD-3-Clause
++++++ regex-tdfa-1.2.3.tar.gz -> regex-tdfa-1.2.3.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/regex-tdfa-1.2.3/CHANGELOG.md
new/regex-tdfa-1.2.3.1/CHANGELOG.md
--- old/regex-tdfa-1.2.3/CHANGELOG.md 2018-03-10 15:00:10.000000000 +0100
+++ new/regex-tdfa-1.2.3.1/CHANGELOG.md 2018-06-22 10:56:03.000000000 +0200
@@ -1,3 +1,7 @@
+# 1.2.3.1
+
+* Compatibility with `containers-0.6`.
+
# 1.2.3
* Added `Semigroup` instances for some types (h/t Herbert Valerio Riedel).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/regex-tdfa-1.2.3/Data/IntMap/CharMap2.hs
new/regex-tdfa-1.2.3.1/Data/IntMap/CharMap2.hs
--- old/regex-tdfa-1.2.3/Data/IntMap/CharMap2.hs 2018-03-10
14:59:08.000000000 +0100
+++ new/regex-tdfa-1.2.3.1/Data/IntMap/CharMap2.hs 2018-06-22
11:57:21.000000000 +0200
@@ -9,6 +9,11 @@
import Data.Char as C(ord)
import Data.List as L (map)
import qualified Data.IntMap as M
+#if MIN_VERSION_containers(0,6,0)
+import qualified Data.IntMap.Internal.Debug as MD
+#else
+import qualified Data.IntMap as MD
+#endif
import qualified Data.IntSet as S(IntSet)
import Data.Semigroup as Sem
@@ -150,10 +155,10 @@
f' a1 b a2 = f a1 (unsafeChr b) a2
fold :: (a -> b -> b) -> b -> CharMap a -> b
-fold f a (CharMap m) = M.fold f a m
+fold f a (CharMap m) = M.foldr f a m
foldWithKey :: (Key -> a -> b -> b) -> b -> CharMap a -> b
-foldWithKey f a (CharMap m) = M.foldWithKey f' a m
+foldWithKey f a (CharMap m) = M.foldrWithKey f' a m
where f' b a1 a2 = f (unsafeChr b) a1 a2
elems :: CharMap a -> [a]
@@ -250,10 +255,10 @@
isProperSubmapOfBy f (CharMap m1) (CharMap m2) = M.isProperSubmapOfBy f m1 m2
showTree :: Show a => CharMap a -> String
-showTree (CharMap m) = M.showTree m
+showTree (CharMap m) = MD.showTree m
showTreeWith :: Show a => Bool -> Bool -> CharMap a -> String
-showTreeWith b1 b2 (CharMap m) = M.showTreeWith b1 b2 m
+showTreeWith b1 b2 (CharMap m) = MD.showTreeWith b1 b2 m
{-# INLINE (!) #-}
{-# INLINE (\\) #-}
{-# INLINE null #-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/regex-tdfa-1.2.3/Data/IntMap/EnumMap2.hs
new/regex-tdfa-1.2.3.1/Data/IntMap/EnumMap2.hs
--- old/regex-tdfa-1.2.3/Data/IntMap/EnumMap2.hs 2018-03-10
14:59:08.000000000 +0100
+++ new/regex-tdfa-1.2.3.1/Data/IntMap/EnumMap2.hs 2018-06-22
11:57:40.000000000 +0200
@@ -1,7 +1,14 @@
+{-# LANGUAGE CPP #-}
+
module Data.IntMap.EnumMap2 where
import Data.Foldable(Foldable(..))
import qualified Data.IntMap as M
+#if MIN_VERSION_containers(0,6,0)
+import qualified Data.IntMap.Internal.Debug as MD
+#else
+import qualified Data.IntMap as MD
+#endif
import qualified Data.IntSet.EnumSet2 as S (EnumSet(..))
import Data.Semigroup as Sem
import Prelude
@@ -144,10 +151,10 @@
f' a1 b a2 = f a1 (toEnum b) a2
fold :: (Enum key) => (a -> b -> b) -> b -> EnumMap key a -> b
-fold f a (EnumMap m) = M.fold f a m
+fold f a (EnumMap m) = M.foldr f a m
foldWithKey :: (Enum key) => (key -> a -> b -> b) -> b -> EnumMap key a -> b
-foldWithKey f a (EnumMap m) = M.foldWithKey f' a m
+foldWithKey f a (EnumMap m) = M.foldrWithKey f' a m
where f' b a1 a2 = f (toEnum b) a1 a2
elems :: (Enum key) => EnumMap key a -> [a]
@@ -245,7 +252,7 @@
isProperSubmapOfBy f (EnumMap m1) (EnumMap m2) = M.isProperSubmapOfBy f m1 m2
showTree :: (Enum key,Show a) => EnumMap key a -> String
-showTree (EnumMap m) = M.showTree m
+showTree (EnumMap m) = MD.showTree m
showTreeWith :: (Enum key,Show a) => Bool -> Bool -> EnumMap key a -> String
-showTreeWith b1 b2 (EnumMap m) = M.showTreeWith b1 b2 m
+showTreeWith b1 b2 (EnumMap m) = MD.showTreeWith b1 b2 m
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/regex-tdfa-1.2.3/regex-tdfa.cabal
new/regex-tdfa-1.2.3.1/regex-tdfa.cabal
--- old/regex-tdfa-1.2.3/regex-tdfa.cabal 2018-03-10 15:04:04.000000000
+0100
+++ new/regex-tdfa-1.2.3.1/regex-tdfa.cabal 2018-06-22 10:56:06.000000000
+0200
@@ -1,5 +1,5 @@
Name: regex-tdfa
-Version: 1.2.3
+Version: 1.2.3.1
License: BSD3
License-File: LICENSE
Copyright: Copyright (c) 2007, Christopher Kuklewicz
@@ -27,14 +27,14 @@
manual: True
library
- Build-Depends: array >= 0.4
- , base >= 4 && < 5
- , bytestring
- , containers
+ Build-Depends: array >= 0.4 && < 0.6
+ , base >= 4 && < 5
+ , bytestring >= 0.10 && < 0.11
+ , containers >= 0.5 && < 0.7
, ghc-prim
- , mtl
- , parsec
- , regex-base >= 0.93.1
+ , mtl == 2.*
+ , parsec == 3.*
+ , regex-base >= 0.93.1
-- Support Semigroup instances uniformly
--
