Hello community, here is the log from the commit of package ghc-xml-types for openSUSE:Factory checked in at 2020-06-19 17:21:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-xml-types (Old) and /work/SRC/openSUSE:Factory/.ghc-xml-types.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-xml-types" Fri Jun 19 17:21:31 2020 rev:4 rq:815224 version:0.3.7 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-xml-types/ghc-xml-types.changes 2019-12-27 13:59:21.500831961 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-xml-types.new.3606/ghc-xml-types.changes 2020-06-19 17:21:34.935576321 +0200 @@ -1,0 +2,6 @@ +Tue Jun 9 09:10:54 UTC 2020 - [email protected] + +- Update xml-types to version 0.3.7. + Upstream does not provide a change log file. + +------------------------------------------------------------------- Old: ---- xml-types-0.3.6.tar.gz New: ---- xml-types-0.3.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-xml-types.spec ++++++ --- /var/tmp/diff_new_pack.7yxW1I/_old 2020-06-19 17:21:39.307589278 +0200 +++ /var/tmp/diff_new_pack.7yxW1I/_new 2020-06-19 17:21:39.311589290 +0200 @@ -1,7 +1,7 @@ # # spec file for package ghc-xml-types # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ %global pkg_name xml-types Name: ghc-%{pkg_name} -Version: 0.3.6 +Version: 0.3.7 Release: 0 Summary: Basic types for representing XML License: MIT @@ -32,6 +32,16 @@ %description Basic types for representing XML. +The idea is to have a full set of appropriate types, which various XML +libraries can share. Instead of having equivalent-but-incompatible types for +every binding, parser, or client, they all share the same types can can thus +interoperate easily. + +This library contains complete types for most parts of an XML document, +including the prologue, node tree, and doctype. Some basic combinators are +included for common tasks, including traversing the node tree and filtering +children. + %package devel Summary: Haskell %{pkg_name} library development files Requires: %{name} = %{version}-%{release} @@ -58,7 +68,7 @@ %ghc_pkg_recache %files -f %{name}.files -%license license.txt +%license COPYING %files devel -f %{name}-devel.files ++++++ xml-types-0.3.6.tar.gz -> xml-types-0.3.7.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xml-types-0.3.6/COPYING new/xml-types-0.3.7/COPYING --- old/xml-types-0.3.6/COPYING 1970-01-01 01:00:00.000000000 +0100 +++ new/xml-types-0.3.7/COPYING 2020-06-07 04:38:02.000000000 +0200 @@ -0,0 +1,22 @@ +Copyright (c) 2010 John Millikin + +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xml-types-0.3.6/lib/Data/XML/Types.hs new/xml-types-0.3.7/lib/Data/XML/Types.hs --- old/xml-types-0.3.6/lib/Data/XML/Types.hs 2015-07-08 07:08:54.000000000 +0200 +++ new/xml-types-0.3.7/lib/Data/XML/Types.hs 2020-06-07 04:38:02.000000000 +0200 @@ -1,16 +1,16 @@ {-# LANGUAGE CPP #-} +#if __GLASGOW_HASKELL__ {-# LANGUAGE DeriveDataTypeable #-} --- if impl(ghc >= 7.2): --- extensions: DeriveGeneric, StandaloneDeriving +#if MIN_VERSION_base(4,4,0) +{-# LANGUAGE DeriveGeneric #-} +#endif +#endif -- | -- Module: Data.XML.Types -- Copyright: 2010-2011 John Millikin -- License: MIT -- --- Maintainer: [email protected] --- Portability: portable --- -- Basic types for representing XML. -- -- The idea is to have a full set of appropriate types, which various XML @@ -25,45 +25,45 @@ -- module Data.XML.Types ( -- * Types - + -- ** Document prologue Document (..) , Prologue (..) , Instruction (..) , Miscellaneous (..) - + -- ** Document body , Node (..) , Element (..) , Content (..) , Name (..) - + -- ** Doctypes , Doctype (..) , ExternalID (..) - + -- ** Incremental processing , Event (..) - + -- * Combinators - + -- ** Filters , isElement , isInstruction , isContent , isComment , isNamed - + -- ** Element traversal , elementChildren , elementContent , elementText - + -- ** Node traversal , nodeChildren , nodeContent , nodeText - + -- ** Attributes , hasAttribute , hasAttributeText @@ -72,79 +72,101 @@ ) where import Control.Monad ((>=>)) -import Data.Data (Data) import Data.Function (on) import Data.Maybe (isJust) import Data.String (IsString, fromString) import Data.Text (Text) import qualified Data.Text as T -import Data.Typeable (Typeable) import Control.DeepSeq (NFData(rnf)) +#if __GLASGOW_HASKELL__ +import Data.Typeable (Typeable) +import Data.Data (Data) + #if MIN_VERSION_base(4,4,0) import GHC.Generics (Generic) #endif +#endif data Document = Document { documentPrologue :: Prologue , documentRoot :: Element , documentEpilogue :: [Miscellaneous] } - deriving (Data, Eq, Ord, Show, Typeable) + deriving (Eq, Ord, Show +#if __GLASGOW_HASKELL__ + , Data, Typeable +#if MIN_VERSION_base(4,4,0) + , Generic +#endif +#endif + ) instance NFData Document where rnf (Document a b c) = rnf a `seq` rnf b `seq` rnf c `seq` () -#if MIN_VERSION_base(4,4,0) -deriving instance Generic Document -#endif - data Prologue = Prologue { prologueBefore :: [Miscellaneous] , prologueDoctype :: Maybe Doctype , prologueAfter :: [Miscellaneous] } - deriving (Data, Eq, Ord, Show, Typeable) + deriving (Eq, Ord, Show +#if __GLASGOW_HASKELL__ + , Data, Typeable +#if MIN_VERSION_base(4,4,0) + , Generic +#endif +#endif + ) instance NFData Prologue where rnf (Prologue a b c) = rnf a `seq` rnf b `seq` rnf c `seq` () -#if MIN_VERSION_base(4,4,0) -deriving instance Generic Prologue -#endif - data Instruction = Instruction { instructionTarget :: Text , instructionData :: Text } - deriving (Data, Eq, Ord, Show, Typeable) + deriving (Eq, Ord, Show +#if __GLASGOW_HASKELL__ + , Data, Typeable +#if MIN_VERSION_base(4,4,0) + , Generic +#endif +#endif + ) instance NFData Instruction where rnf (Instruction a b) = rnf a `seq` rnf b `seq` () -#if MIN_VERSION_base(4,4,0) -deriving instance Generic Instruction -#endif - data Miscellaneous = MiscInstruction Instruction | MiscComment Text - deriving (Data, Eq, Ord, Show, Typeable) + deriving (Eq, Ord, Show +#if __GLASGOW_HASKELL__ + , Data, Typeable +#if MIN_VERSION_base(4,4,0) + , Generic +#endif +#endif + ) instance NFData Miscellaneous where rnf (MiscInstruction a) = rnf a `seq` () rnf (MiscComment a) = rnf a `seq` () -#if MIN_VERSION_base(4,4,0) -deriving instance Generic Miscellaneous -#endif - data Node = NodeElement Element | NodeInstruction Instruction | NodeContent Content | NodeComment Text - deriving (Data, Eq, Ord, Show, Typeable) + deriving (Eq, Ord, Show +#if __GLASGOW_HASKELL__ + , Data, Typeable +#if MIN_VERSION_base(4,4,0) + , Generic +#endif +#endif + ) instance NFData Node where rnf (NodeElement a) = rnf a `seq` () @@ -152,36 +174,44 @@ rnf (NodeContent a) = rnf a `seq` () rnf (NodeComment a) = rnf a `seq` () -#if MIN_VERSION_base(4,4,0) -deriving instance Generic Node -#endif +instance IsString Node where + fromString = NodeContent . fromString data Element = Element { elementName :: Name , elementAttributes :: [(Name, [Content])] , elementNodes :: [Node] } - deriving (Data, Eq, Ord, Show, Typeable) + deriving (Eq, Ord, Show +#if __GLASGOW_HASKELL__ + , Data, Typeable +#if MIN_VERSION_base(4,4,0) + , Generic +#endif +#endif + ) instance NFData Element where rnf (Element a b c) = rnf a `seq` rnf b `seq` rnf c `seq` () -#if MIN_VERSION_base(4,4,0) -deriving instance Generic Element -#endif - data Content = ContentText Text | ContentEntity Text -- ^ For pass-through parsing - deriving (Data, Eq, Ord, Show, Typeable) + deriving (Eq, Ord, Show +#if __GLASGOW_HASKELL__ + , Data, Typeable +#if MIN_VERSION_base(4,4,0) + , Generic +#endif +#endif + ) instance NFData Content where rnf (ContentText a) = rnf a `seq` () rnf (ContentEntity a) = rnf a `seq` () -#if MIN_VERSION_base(4,4,0) -deriving instance Generic Content -#endif +instance IsString Content where + fromString = ContentText . fromString -- | A fully qualified name. -- @@ -203,7 +233,14 @@ , nameNamespace :: Maybe Text , namePrefix :: Maybe Text } - deriving (Data, Show, Typeable) + deriving (Show +#if __GLASGOW_HASKELL__ + , Data, Typeable +#if MIN_VERSION_base(4,4,0) + , Generic +#endif +#endif + ) instance Eq Name where (==) = (==) `on` (\x -> (nameNamespace x, nameLocalName x)) @@ -221,10 +258,6 @@ instance NFData Name where rnf (Name a b c) = rnf a `seq` rnf b `seq` rnf c `seq` () -#if MIN_VERSION_base(4,4,0) -deriving instance Generic Name -#endif - -- | Note: due to the incredible complexity of DTDs, this type only supports -- external subsets. I've tried adding internal subset types, but they -- quickly gain more code than the rest of this module put together. @@ -235,28 +268,34 @@ { doctypeName :: Text , doctypeID :: Maybe ExternalID } - deriving (Data, Eq, Ord, Show, Typeable) + deriving (Eq, Ord, Show +#if __GLASGOW_HASKELL__ + , Data, Typeable +#if MIN_VERSION_base(4,4,0) + , Generic +#endif +#endif + ) instance NFData Doctype where rnf (Doctype a b) = rnf a `seq` rnf b `seq` () -#if MIN_VERSION_base(4,4,0) -deriving instance Generic Doctype -#endif - data ExternalID = SystemID Text | PublicID Text Text - deriving (Data, Eq, Ord, Show, Typeable) + deriving (Eq, Ord, Show +#if __GLASGOW_HASKELL__ + , Data, Typeable +#if MIN_VERSION_base(4,4,0) + , Generic +#endif +#endif + ) instance NFData ExternalID where rnf (SystemID a) = rnf a `seq` () rnf (PublicID a b) = rnf a `seq` rnf b `seq` () -#if MIN_VERSION_base(4,4,0) -deriving instance Generic ExternalID -#endif - -- | Some XML processing tools are incremental, and work in terms of events -- rather than node trees. The 'Event' type allows a document to be fully -- specified as a sequence of events. @@ -280,7 +319,14 @@ | EventContent Content | EventComment Text | EventCDATA Text - deriving (Data, Eq, Ord, Show, Typeable) + deriving (Eq, Ord, Show +#if __GLASGOW_HASKELL__ + , Data, Typeable +#if MIN_VERSION_base(4,4,0) + , Generic +#endif +#endif + ) instance NFData Event where rnf (EventBeginDoctype a b) = rnf a `seq` rnf b `seq` () @@ -292,10 +338,6 @@ rnf (EventCDATA a) = rnf a `seq` () rnf _ = () -#if MIN_VERSION_base(4,4,0) -deriving instance Generic Event -#endif - isElement :: Node -> [Element] isElement (NodeElement e) = [e] isElement _ = [] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xml-types-0.3.6/license.txt new/xml-types-0.3.7/license.txt --- old/xml-types-0.3.6/license.txt 2015-07-08 07:08:54.000000000 +0200 +++ new/xml-types-0.3.7/license.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -Copyright (c) 2010 John Millikin - -Permission is hereby granted, free of charge, to any person -obtaining a copy of this software and associated documentation -files (the "Software"), to deal in the Software without -restriction, including without limitation the rights to use, -copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the -Software is furnished to do so, subject to the following -conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -OTHER DEALINGS IN THE SOFTWARE. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xml-types-0.3.6/xml-types.cabal new/xml-types-0.3.7/xml-types.cabal --- old/xml-types-0.3.6/xml-types.cabal 2015-07-08 07:08:54.000000000 +0200 +++ new/xml-types-0.3.7/xml-types.cabal 2020-06-07 04:38:02.000000000 +0200 @@ -1,35 +1,43 @@ name: xml-types -version: 0.3.6 +version: 0.3.7 synopsis: Basic types for representing XML license: MIT -license-file: license.txt +license-file: COPYING author: John Millikin <[email protected]> -maintainer: [email protected] +maintainer: Stephen Paul Weber <[email protected]> build-type: Simple -cabal-version: >= 1.6 +cabal-version: >= 1.10 category: Text, XML stability: experimental -homepage: https://john-millikin.com/software/haskell-xml/ -bug-reports: mailto:[email protected] +homepage: https://git.singpolyma.net/xml-types-haskell +bug-reports: mailto:[email protected] +description: + Basic types for representing XML. + . + The idea is to have a full set of appropriate types, which various XML + libraries can share. Instead of having equivalent-but-incompatible types + for every binding, parser, or client, they all share the same types can + can thus interoperate easily. + . + This library contains complete types for most parts of an XML document, + including the prologue, node tree, and doctype. Some basic combinators + are included for common tasks, including traversing the node tree and + filtering children. source-repository head type: git - location: https://john-millikin.com/code/haskell-xml-types/ + location: https://git.singpolyma.net/xml-types-haskell source-repository this type: git - location: https://john-millikin.com/code/haskell-xml-types/ - tag: xml-types_0.3.6 + location: https://git.singpolyma.net/xml-types-haskell + tag: 0.3.7 library - ghc-options: -Wall + default-language: Haskell2010 + ghc-options: -Wall -Wno-tabs hs-source-dirs: lib - if impl(ghc >= 7.2) - extensions: DeriveGeneric, StandaloneDeriving - if impl(ghc >= 7.2) && impl(ghc < 7.6) - build-depends: ghc-prim - build-depends: base >= 3.0 && < 5.0 , deepseq >= 1.1.0.0
