Hello community, here is the log from the commit of package ghc-blaze-markup for openSUSE:Factory checked in at 2016-08-25 09:57:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-blaze-markup (Old) and /work/SRC/openSUSE:Factory/.ghc-blaze-markup.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-blaze-markup" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-blaze-markup/ghc-blaze-markup.changes 2016-07-21 08:07:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-blaze-markup.new/ghc-blaze-markup.changes 2016-08-25 09:57:45.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Aug 1 14:07:14 UTC 2016 - [email protected] + +- Update to version 0.7.1.0 revision 0 with cabal2obs. + +------------------------------------------------------------------- Old: ---- blaze-markup-0.7.0.3.tar.gz New: ---- blaze-markup-0.7.1.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-blaze-markup.spec ++++++ --- /var/tmp/diff_new_pack.OfVBcu/_old 2016-08-25 09:57:47.000000000 +0200 +++ /var/tmp/diff_new_pack.OfVBcu/_new 2016-08-25 09:57:47.000000000 +0200 @@ -19,15 +19,14 @@ %global pkg_name blaze-markup %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.7.0.3 +Version: 0.7.1.0 Release: 0 Summary: A blazingly fast markup combinator library for Haskell License: BSD-3-Clause -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 BuildRequires: ghc-Cabal-devel -# Begin cabal-rpm deps: BuildRequires: ghc-blaze-builder-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-rpm-macros @@ -41,7 +40,6 @@ BuildRequires: ghc-test-framework-hunit-devel BuildRequires: ghc-test-framework-quickcheck2-devel %endif -# End cabal-rpm deps %description Core modules of a blazingly fast markup combinator library for the Haskell @@ -62,20 +60,14 @@ %prep %setup -q -n %{pkg_name}-%{version} - %build %ghc_lib_build - %install %ghc_lib_install - %check -%if %{with tests} -%{cabal} test -%endif - +%cabal_test %post devel %ghc_pkg_recache ++++++ blaze-markup-0.7.0.3.tar.gz -> blaze-markup-0.7.1.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blaze-markup-0.7.0.3/CHANGELOG new/blaze-markup-0.7.1.0/CHANGELOG --- old/blaze-markup-0.7.0.3/CHANGELOG 2015-09-28 11:45:08.000000000 +0200 +++ new/blaze-markup-0.7.1.0/CHANGELOG 2016-07-24 14:52:21.000000000 +0200 @@ -1,3 +1,7 @@ +- 0.7.1.0 + * Relax `QuickCheck` dependency to allow 2.9 + * Add text builder instances + - 0.7.0.3 * Relax `HUnit` dependency to allow 1.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blaze-markup-0.7.0.3/blaze-markup.cabal new/blaze-markup-0.7.1.0/blaze-markup.cabal --- old/blaze-markup-0.7.0.3/blaze-markup.cabal 2015-09-28 11:45:08.000000000 +0200 +++ new/blaze-markup-0.7.1.0/blaze-markup.cabal 2016-07-24 14:52:21.000000000 +0200 @@ -1,5 +1,5 @@ Name: blaze-markup -Version: 0.7.0.3 +Version: 0.7.1.0 Homepage: http://jaspervdj.be/blaze Bug-Reports: http://github.com/jaspervdj/blaze-markup/issues License: BSD3 @@ -51,7 +51,7 @@ Build-depends: HUnit >= 1.2 && < 1.4, - QuickCheck >= 2.4 && < 2.9, + QuickCheck >= 2.4 && < 2.10, containers >= 0.3 && < 0.6, test-framework >= 0.4 && < 0.9, test-framework-hunit >= 0.3 && < 0.4, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blaze-markup-0.7.0.3/src/Text/Blaze/Internal.hs new/blaze-markup-0.7.1.0/src/Text/Blaze/Internal.hs --- old/blaze-markup-0.7.0.3/src/Text/Blaze/Internal.hs 2015-09-28 11:45:08.000000000 +0200 +++ new/blaze-markup-0.7.1.0/src/Text/Blaze/Internal.hs 2016-07-24 14:52:21.000000000 +0200 @@ -31,6 +31,8 @@ , preEscapedText , lazyText , preEscapedLazyText + , textBuilder + , preEscapedTextBuilder , string , preEscapedString , unsafeByteString @@ -52,6 +54,8 @@ , preEscapedTextValue , lazyTextValue , preEscapedLazyTextValue + , textBuilderValue + , preEscapedTextBuilderValue , stringValue , preEscapedStringValue , unsafeByteStringValue @@ -85,6 +89,7 @@ import qualified Data.Text as T import qualified Data.Text.Encoding as T import qualified Data.Text.Lazy as LT +import qualified Data.Text.Lazy.Builder as LTB -- | A static string that supports efficient output to all possible backends. -- @@ -245,7 +250,7 @@ -- -- > <p data-foo="bar">Hello.</p> -- --- We support this in BlazeMarkup using this funcion. The above fragment could +-- We support this in BlazeMarkup using this function. The above fragment could -- be described using BlazeMarkup with: -- -- > p ! dataAttribute "foo" "bar" $ "Hello." @@ -303,6 +308,21 @@ preEscapedLazyText :: LT.Text -- ^ Text to insert -> Markup -- ^ Resulting HTML fragment preEscapedLazyText = mconcat . map preEscapedText . LT.toChunks +{-# INLINE preEscapedLazyText #-} + +-- | A variant of 'text' for text 'LTB.Builder'. +-- +textBuilder :: LTB.Builder -- ^ Text to insert + -> Markup -- ^ Resulting HTML fragment +textBuilder = lazyText . LTB.toLazyText +{-# INLINE textBuilder #-} + +-- | A variant of 'preEscapedText' for lazy 'LT.Text' +-- +preEscapedTextBuilder :: LTB.Builder -- ^ Text to insert + -> Markup -- ^ Resulting HTML fragment +preEscapedTextBuilder = preEscapedLazyText . LTB.toLazyText +{-# INLINE preEscapedTextBuilder #-} -- | Create an HTML snippet from a 'String'. -- @@ -409,6 +429,20 @@ preEscapedLazyTextValue = mconcat . map preEscapedTextValue . LT.toChunks {-# INLINE preEscapedLazyTextValue #-} +-- | A variant of 'textValue' for text 'LTB.Builder' +-- +textBuilderValue :: LTB.Builder -- ^ The actual value + -> AttributeValue -- ^ Resulting attribute value +textBuilderValue = lazyTextValue . LTB.toLazyText +{-# INLINE textBuilderValue #-} + +-- | A variant of 'preEscapedTextValue' for text 'LTB.Builder' +-- +preEscapedTextBuilderValue :: LTB.Builder -- ^ The actual value + -> AttributeValue -- ^ Resulting attribute value +preEscapedTextBuilderValue = preEscapedLazyTextValue . LTB.toLazyText +{-# INLINE preEscapedTextBuilderValue #-} + -- | Create an attribute value from a 'String'. -- stringValue :: String -> AttributeValue diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blaze-markup-0.7.0.3/src/Text/Blaze.hs new/blaze-markup-0.7.1.0/src/Text/Blaze.hs --- old/blaze-markup-0.7.0.3/src/Text/Blaze.hs 2015-09-28 11:45:08.000000000 +0200 +++ new/blaze-markup-0.7.1.0/src/Text/Blaze.hs 2016-07-24 14:52:21.000000000 +0200 @@ -93,6 +93,7 @@ import Data.Text (Text) import qualified Data.Text.Lazy as LT +import qualified Data.Text.Lazy.Builder as LTB import Text.Blaze.Internal @@ -129,6 +130,12 @@ preEscapedToMarkup = preEscapedLazyText {-# INLINE preEscapedToMarkup #-} +instance ToMarkup LTB.Builder where + toMarkup = textBuilder + {-# INLINE toMarkup #-} + preEscapedToMarkup = preEscapedTextBuilder + {-# INLINE preEscapedToMarkup #-} + instance ToMarkup String where toMarkup = string {-# INLINE toMarkup #-} @@ -208,6 +215,12 @@ preEscapedToValue = preEscapedLazyTextValue {-# INLINE preEscapedToValue #-} +instance ToValue LTB.Builder where + toValue = textBuilderValue + {-# INLINE toValue #-} + preEscapedToValue = preEscapedTextBuilderValue + {-# INLINE preEscapedToValue #-} + instance ToValue String where toValue = stringValue {-# INLINE toValue #-}
