Hello community, here is the log from the commit of package ghc-chunked-data for openSUSE:Factory checked in at 2016-10-22 13:20:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-chunked-data (Old) and /work/SRC/openSUSE:Factory/.ghc-chunked-data.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-chunked-data" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-chunked-data/ghc-chunked-data.changes 2016-07-21 08:07:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-chunked-data.new/ghc-chunked-data.changes 2016-10-22 13:20:13.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Sep 15 07:00:10 UTC 2016 - [email protected] + +- Update to version 0.3.0 revision 0 with cabal2obs. + +------------------------------------------------------------------- Old: ---- 2.cabal chunked-data-0.2.0.tar.gz New: ---- chunked-data-0.3.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-chunked-data.spec ++++++ --- /var/tmp/diff_new_pack.hhJFce/_old 2016-10-22 13:20:14.000000000 +0200 +++ /var/tmp/diff_new_pack.hhJFce/_new 2016-10-22 13:20:14.000000000 +0200 @@ -18,27 +18,22 @@ %global pkg_name chunked-data Name: ghc-%{pkg_name} -Version: 0.2.0 +Version: 0.3.0 Release: 0 Summary: Typeclasses for dealing with various chunked data representations 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/2.cabal BuildRequires: ghc-Cabal-devel -# Begin cabal-rpm deps: -BuildRequires: ghc-blaze-builder-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-containers-devel -BuildRequires: ghc-mono-traversable-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-semigroups-devel BuildRequires: ghc-text-devel BuildRequires: ghc-transformers-devel BuildRequires: ghc-vector-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build -# End cabal-rpm deps %description Originally present in classy-prelude. @@ -56,17 +51,13 @@ %prep %setup -q -n %{pkg_name}-%{version} -cp -p %{SOURCE1} %{pkg_name}.cabal - %build %ghc_lib_build - %install %ghc_lib_install - %post devel %ghc_pkg_recache ++++++ chunked-data-0.2.0.tar.gz -> chunked-data-0.3.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/chunked-data-0.2.0/ChangeLog.md new/chunked-data-0.3.0/ChangeLog.md --- old/chunked-data-0.2.0/ChangeLog.md 2015-05-12 13:30:56.000000000 +0200 +++ new/chunked-data-0.3.0/ChangeLog.md 2016-07-04 18:46:00.000000000 +0200 @@ -1,3 +1,9 @@ +## 0.3.0 + +* Move `Data.Sequences.Lazy` to `mono-traversable` 1.0.0 +* Move `Data.Textual.Encoding` to `mono-traversable` 1.0.0 +* Switch from blaze-builder to bytestring 0.10.2 or later + ## 0.2.0 * Move away from system-filepath diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/chunked-data-0.2.0/Data/Builder.hs new/chunked-data-0.3.0/Data/Builder.hs --- old/chunked-data-0.2.0/Data/Builder.hs 2015-05-12 13:30:56.000000000 +0200 +++ new/chunked-data-0.3.0/Data/Builder.hs 2016-07-04 18:46:00.000000000 +0200 @@ -22,8 +22,11 @@ import qualified Data.ByteString as S import qualified Data.ByteString.Lazy as L -import qualified Blaze.ByteString.Builder as BB -import qualified Blaze.ByteString.Builder.Char.Utf8 as BB +import qualified Data.ByteString.Builder as BB +import qualified Data.ByteString.Builder.Extra as BB (flush) + +import qualified Data.Text.Encoding as TE +import qualified Data.Text.Lazy.Encoding as TLE -- | Since 0.1.0.0 type TextBuilder = TB.Builder @@ -31,6 +34,9 @@ -- | Since 0.1.0.0 type BlazeBuilder = BB.Builder +-- | Since 0.3.0.0 +type ByteStringBuilder = BB.Builder + -- | Since 0.1.0.0 class Monoid builder => Builder builder lazy | builder -> lazy, lazy -> builder where -- | Since 0.1.0.0 @@ -68,18 +74,18 @@ instance ToBuilder BB.Builder BB.Builder where toBuilder = id instance ToBuilder T.Text BB.Builder where - toBuilder = BB.fromText + toBuilder = TE.encodeUtf8Builder instance ToBuilder TL.Text BB.Builder where - toBuilder = BB.fromLazyText + toBuilder = TLE.encodeUtf8Builder instance ToBuilder Char BB.Builder where - toBuilder = BB.fromChar + toBuilder = toBuilder . T.singleton instance (a ~ Char) => ToBuilder [a] BB.Builder where - toBuilder = BB.fromString + toBuilder = toBuilder . TL.pack instance ToBuilder S.ByteString BB.Builder where - toBuilder = BB.fromByteString + toBuilder = BB.byteString instance ToBuilder L.ByteString BB.Builder where - toBuilder = BB.fromLazyByteString + toBuilder = BB.lazyByteString -- | Provided for type disambiguation in the presence of OverloadedStrings. -- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/chunked-data-0.2.0/Data/IOData.hs new/chunked-data-0.3.0/Data/IOData.hs --- old/chunked-data-0.2.0/Data/IOData.hs 2015-05-12 13:30:56.000000000 +0200 +++ new/chunked-data-0.3.0/Data/IOData.hs 2016-07-04 18:46:00.000000000 +0200 @@ -8,8 +8,6 @@ import qualified Data.ByteString.Char8 as ByteString8 import qualified Data.ByteString.Lazy as LByteString import Data.ByteString.Lazy.Internal (defaultChunkSize) -import Data.Sequences (IsSequence) -import Data.Sequences.Lazy (fromStrict) import qualified Data.Text as Text import qualified Data.Text.IO as Text import qualified Data.Text.Lazy as LText @@ -28,7 +26,7 @@ -- -- Note that, for lazy sequences, these operations may perform -- lazy I\/O. -class IsSequence a => IOData a where +class IOData a where readFile :: MonadIO m => FilePath -> m a writeFile :: MonadIO m => FilePath -> a -> m () getLine :: MonadIO m => m a @@ -49,14 +47,14 @@ instance IOData LByteString.ByteString where readFile = liftIO . LByteString.readFile writeFile fp = liftIO . LByteString.writeFile fp - getLine = liftM fromStrict (liftIO ByteString.getLine) + getLine = liftM LByteString.fromStrict (liftIO ByteString.getLine) hGetContents = liftIO . LByteString.hGetContents - hGetLine = liftM fromStrict . liftIO . ByteString.hGetLine + hGetLine = liftM LByteString.fromStrict . liftIO . ByteString.hGetLine hPut h = liftIO . LByteString.hPut h hPutStrLn h lbs = liftIO $ do LByteString.hPutStr h lbs ByteString8.hPutStrLn h ByteString.empty - hGetChunk = liftM fromStrict . hGetChunk + hGetChunk = liftM LByteString.fromStrict . hGetChunk instance IOData Text.Text where readFile = liftIO . Text.readFile writeFile fp = liftIO . Text.writeFile fp @@ -85,7 +83,7 @@ hGetLine = liftIO . LText.hGetLine hPut h = liftIO . LText.hPutStr h hPutStrLn h = liftIO . LText.hPutStrLn h - hGetChunk = liftM fromStrict . hGetChunk + hGetChunk = liftM LText.fromStrict . hGetChunk instance (Char ~ c) => IOData [c] where readFile = liftIO . Prelude.readFile writeFile fp = liftIO . Prelude.writeFile fp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/chunked-data-0.2.0/Data/Sequences/Lazy.hs new/chunked-data-0.3.0/Data/Sequences/Lazy.hs --- old/chunked-data-0.2.0/Data/Sequences/Lazy.hs 2015-05-12 13:30:56.000000000 +0200 +++ new/chunked-data-0.3.0/Data/Sequences/Lazy.hs 1970-01-01 01:00:00.000000000 +0100 @@ -1,28 +0,0 @@ -{-# LANGUAGE FunctionalDependencies #-} -{-# LANGUAGE MultiParamTypeClasses #-} -module Data.Sequences.Lazy where - -import qualified Data.ByteString as S -import qualified Data.ByteString.Lazy as L -import Data.Sequences -import qualified Data.Text as T -import qualified Data.Text.Lazy as TL - --- | Lazy sequences containing strict chunks of data. -class (IsSequence lazy, IsSequence strict) => LazySequence lazy strict | lazy -> strict, strict -> lazy where - toChunks :: lazy -> [strict] - fromChunks :: [strict] -> lazy - toStrict :: lazy -> strict - fromStrict :: strict -> lazy - -instance LazySequence L.ByteString S.ByteString where - toChunks = L.toChunks - fromChunks = L.fromChunks - toStrict = S.concat . L.toChunks - fromStrict = L.fromChunks . return - -instance LazySequence TL.Text T.Text where - toChunks = TL.toChunks - fromChunks = TL.fromChunks - toStrict = TL.toStrict - fromStrict = TL.fromStrict diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/chunked-data-0.2.0/Data/Textual/Encoding.hs new/chunked-data-0.3.0/Data/Textual/Encoding.hs --- old/chunked-data-0.2.0/Data/Textual/Encoding.hs 2015-05-12 13:30:56.000000000 +0200 +++ new/chunked-data-0.3.0/Data/Textual/Encoding.hs 1970-01-01 01:00:00.000000000 +0100 @@ -1,31 +0,0 @@ -{-# LANGUAGE FunctionalDependencies #-} -{-# LANGUAGE MultiParamTypeClasses #-} -{-# LANGUAGE TypeFamilies #-} -{-# LANGUAGE UndecidableInstances #-} -module Data.Textual.Encoding where - -import qualified Data.ByteString as S -import qualified Data.ByteString.Lazy as L -import Data.Sequences -import qualified Data.Text as T -import qualified Data.Text.Encoding as T -import Data.Text.Encoding.Error (lenientDecode) -import qualified Data.Text.Lazy as TL -import qualified Data.Text.Lazy.Encoding as TL -import Data.Word (Word8) - --- | Textual data which can be encoded to and decoded from UTF8. -class (Textual textual, IsSequence binary) => Utf8 textual binary | textual -> binary, binary -> textual where - encodeUtf8 :: textual -> binary - -- | Note that this function is required to be pure. In the case of - -- a decoding error, Unicode replacement characters must be used. - decodeUtf8 :: binary -> textual -instance (c ~ Char, w ~ Word8) => Utf8 [c] [w] where - encodeUtf8 = L.unpack . TL.encodeUtf8 . TL.pack - decodeUtf8 = TL.unpack . TL.decodeUtf8With lenientDecode . L.pack -instance Utf8 T.Text S.ByteString where - encodeUtf8 = T.encodeUtf8 - decodeUtf8 = T.decodeUtf8With lenientDecode -instance Utf8 TL.Text L.ByteString where - encodeUtf8 = TL.encodeUtf8 - decodeUtf8 = TL.decodeUtf8With lenientDecode diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/chunked-data-0.2.0/chunked-data.cabal new/chunked-data-0.3.0/chunked-data.cabal --- old/chunked-data-0.2.0/chunked-data.cabal 2015-05-12 13:30:56.000000000 +0200 +++ new/chunked-data-0.3.0/chunked-data.cabal 2016-07-04 18:46:00.000000000 +0200 @@ -1,8 +1,8 @@ name: chunked-data -version: 0.2.0 +version: 0.3.0 synopsis: Typeclasses for dealing with various chunked data representations description: Originally present in classy-prelude. -homepage: https://github.com/fpco/chunked-data +homepage: https://github.com/snoyberg/mono-traversable license: MIT license-file: LICENSE author: Michael Snoyman @@ -14,20 +14,16 @@ library exposed-modules: Data.IOData - Data.Textual.Encoding - Data.Sequences.Lazy Data.Builder Data.ChunkedZip build-depends: base >= 4 && < 5 , transformers - , bytestring - , mono-traversable >=0.2 - , text >= 0.11 - , blaze-builder + , bytestring >= 0.10.2 + , text >= 1.2 , containers , vector , semigroups source-repository head type: git - location: git://github.com/fpco/chunked-data.git + location: https://github.com/snoyberg/mono-traversable.git
