Hello community,
here is the log from the commit of package ghc-hxt for openSUSE:Factory checked
in at 2017-03-24 02:18:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-hxt (Old)
and /work/SRC/openSUSE:Factory/.ghc-hxt.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-hxt"
Fri Mar 24 02:18:38 2017 rev:2 rq:479411 version:9.3.1.16
Changes:
--------
--- /work/SRC/openSUSE:Factory/ghc-hxt/ghc-hxt.changes 2017-03-08
00:56:41.645400608 +0100
+++ /work/SRC/openSUSE:Factory/.ghc-hxt.new/ghc-hxt.changes 2017-03-24
02:18:39.485503314 +0100
@@ -1,0 +2,5 @@
+Thu Oct 27 15:54:37 UTC 2016 - psim...@suse.com
+
+- Update to version 9.3.1.16 with cabal2obs.
+
+-------------------------------------------------------------------
Old:
----
hxt-9.3.1.15.tar.gz
New:
----
hxt-9.3.1.16.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-hxt.spec ++++++
--- /var/tmp/diff_new_pack.kihDKp/_old 2017-03-24 02:18:40.165407113 +0100
+++ /var/tmp/diff_new_pack.kihDKp/_new 2017-03-24 02:18:40.165407113 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ghc-hxt
#
-# 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
@@ -18,16 +18,14 @@
%global pkg_name hxt
Name: ghc-%{pkg_name}
-Version: 9.3.1.15
+Version: 9.3.1.16
Release: 0
Summary: A collection of tools for processing XML with Haskell
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
BuildRequires: ghc-Cabal-devel
-# Begin cabal-rpm deps:
-BuildRequires: ghc-HUnit-devel
BuildRequires: ghc-binary-devel
BuildRequires: ghc-bytestring-devel
BuildRequires: ghc-containers-devel
@@ -42,7 +40,6 @@
BuildRequires: ghc-parsec-devel
BuildRequires: ghc-rpm-macros
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-# End cabal-rpm deps
%description
The Haskell XML Toolbox bases on the ideas of HaXml and HXML, but introduces a
@@ -58,6 +55,8 @@
contain the extensions. hxt-unicode contains encoding and decoding functions,
hxt-charproperties char properties for unicode and XML.
+Changes from 9.3.1.15: Bug in quoting PI instructions in showXmlTrees fixed
+
Changes from 9.3.1.14: For ghc-7.10 network-uri is automatically selected
Changes from 9.3.1.13: ghc-7.10 compatibility
@@ -114,15 +113,12 @@
%prep
%setup -q -n %{pkg_name}-%{version}
-
%build
%ghc_lib_build
-
%install
%ghc_lib_install
-
%post devel
%ghc_pkg_recache
++++++ hxt-9.3.1.15.tar.gz -> hxt-9.3.1.16.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/hxt-9.3.1.15/hxt.cabal new/hxt-9.3.1.16/hxt.cabal
--- old/hxt-9.3.1.15/hxt.cabal 2015-02-06 17:37:11.000000000 +0100
+++ new/hxt-9.3.1.16/hxt.cabal 2016-10-18 10:31:22.000000000 +0200
@@ -1,6 +1,6 @@
-- arch-tag: Haskell XML Toolbox main description file
Name: hxt
-Version: 9.3.1.15
+Version: 9.3.1.16
Synopsis: A collection of tools for processing XML with Haskell.
Description: The Haskell XML Toolbox bases on the ideas of HaXml and HXML,
but introduces a more general approach for processing XML with
Haskell.
@@ -17,6 +17,8 @@
hxt-unicode contains encoding and decoding functions,
hxt-charproperties char properties for unicode and XML.
.
+ Changes from 9.3.1.15: Bug in quoting PI instructions in
showXmlTrees fixed
+ .
Changes from 9.3.1.14: For ghc-7.10 network-uri is
automatically selected
.
Changes from 9.3.1.13: ghc-7.10 compatibility
@@ -64,7 +66,7 @@
Stability: Stable
Category: XML
Homepage: https://github.com/UweSchmidt/hxt
-Copyright: Copyright (c) 2005-2015 Uwe Schmidt
+Copyright: Copyright (c) 2005-20161 Uwe Schmidt
Build-type: Simple
Cabal-version: >=1.8
@@ -214,18 +216,17 @@
extensions: MultiParamTypeClasses DeriveDataTypeable FunctionalDependencies
FlexibleInstances CPP
build-depends: base >= 4 && < 5,
- containers >= 0.2 && < 1,
- directory >= 1 && < 2,
- filepath >= 1 && < 2,
+ containers >= 0.2,
+ directory >= 1,
+ filepath >= 1,
parsec >= 2.1 && < 4,
- HUnit >= 1.2 && < 2,
mtl >= 2.0.1 && < 3,
- deepseq >= 1.1 && < 2,
- bytestring >= 0.9 && < 1,
- binary >= 0.5 && < 1,
- hxt-charproperties >= 9.1 && < 10,
- hxt-unicode >= 9.0.1 && < 10,
- hxt-regex-xmlschema >= 9.2 && < 10
+ deepseq >= 1.1,
+ bytestring >= 0.9,
+ binary >= 0.5,
+ hxt-charproperties >= 9.1,
+ hxt-unicode >= 9.0.1,
+ hxt-regex-xmlschema >= 9.2
if flag(network-uri)
build-depends: network-uri >= 2.6
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/hxt-9.3.1.15/src/Control/Arrow/ArrowTree.hs
new/hxt-9.3.1.16/src/Control/Arrow/ArrowTree.hs
--- old/hxt-9.3.1.15/src/Control/Arrow/ArrowTree.hs 2015-02-06
17:37:11.000000000 +0100
+++ new/hxt-9.3.1.16/src/Control/Arrow/ArrowTree.hs 2016-10-18
09:37:06.000000000 +0200
@@ -147,7 +147,7 @@
--
-- This expression selects
-- all top level \"table\" elements within an \"html\" element, an
expression.
- -- Attantion: This does not correspond
+ -- Attention: This does not correspond
-- to the XPath selection path \"html\/\/table\". The latter on matches
all table elements
-- even nested ones, but @\/\/>@ gives in many cases the appropriate
functionality.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/hxt-9.3.1.15/src/Data/Tree/NTree/TypeDefs.hs
new/hxt-9.3.1.16/src/Data/Tree/NTree/TypeDefs.hs
--- old/hxt-9.3.1.15/src/Data/Tree/NTree/TypeDefs.hs 2015-02-06
17:37:11.000000000 +0100
+++ new/hxt-9.3.1.16/src/Data/Tree/NTree/TypeDefs.hs 2016-10-18
12:11:32.000000000 +0200
@@ -23,7 +23,6 @@
module Data.Tree.NTree.TypeDefs
where
-import Control.Applicative ((<$>))
import Control.DeepSeq (NFData (..))
import Control.FlatSeq (WNFData (..), rlnf)
@@ -32,6 +31,11 @@
import Data.Tree.Class (Tree (..))
import Data.Typeable (Typeable)
+#if MIN_VERSION_base(4,8,2)
+#else
+import Control.Applicative ((<$>))
+#endif
+
#if MIN_VERSION_base(4,8,0)
#else
import Control.Applicative (Applicative (..))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/hxt-9.3.1.15/src/Text/XML/HXT/Arrow/DocumentInput.hs
new/hxt-9.3.1.16/src/Text/XML/HXT/Arrow/DocumentInput.hs
--- old/hxt-9.3.1.15/src/Text/XML/HXT/Arrow/DocumentInput.hs 2015-02-06
17:37:11.000000000 +0100
+++ new/hxt-9.3.1.16/src/Text/XML/HXT/Arrow/DocumentInput.hs 2016-10-18
09:37:06.000000000 +0200
@@ -231,7 +231,7 @@
If the source name is empty, the input is read from standard input.
The source is transformed into an absolute URI. If the source is a relative
URI, or a file name,
- it is expanded into an absolut URI with respect to the current base URI.
+ it is expanded into an absolute URI with respect to the current base URI.
The default base URI is of protocol \"file\" and points to the current
working directory.
The currently supported protocols are \"http\", \"file\", \"stdin\" and
\"string\".
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/hxt-9.3.1.15/src/Text/XML/HXT/Arrow/XmlOptions.hs
new/hxt-9.3.1.16/src/Text/XML/HXT/Arrow/XmlOptions.hs
--- old/hxt-9.3.1.15/src/Text/XML/HXT/Arrow/XmlOptions.hs 2015-02-06
17:37:11.000000000 +0100
+++ new/hxt-9.3.1.16/src/Text/XML/HXT/Arrow/XmlOptions.hs 2016-10-18
09:37:06.000000000 +0200
@@ -241,7 +241,7 @@
-- ------------------------------------------------------------
-- |
--- select options from a predefined list of option desciptions
+-- select options from a predefined list of option descriptions
selectOptions :: [String] -> [OptDescr a] -> [OptDescr a]
selectOptions ol os
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hxt-9.3.1.15/src/Text/XML/HXT/Arrow/XmlState/SystemConfig.hs
new/hxt-9.3.1.16/src/Text/XML/HXT/Arrow/XmlState/SystemConfig.hs
--- old/hxt-9.3.1.15/src/Text/XML/HXT/Arrow/XmlState/SystemConfig.hs
2015-02-06 17:37:11.000000000 +0100
+++ new/hxt-9.3.1.16/src/Text/XML/HXT/Arrow/XmlState/SystemConfig.hs
2016-10-18 09:37:06.000000000 +0200
@@ -31,12 +31,12 @@
-- config options
--- | @withTace level@ : system option, set the trace level, (0..4)
+-- | @withTrace level@ : system option, set the trace level, (0..4)
withTrace :: Int -> SysConfig
withTrace = setS theTraceLevel
--- | @withSysAttr key value@ : store an arbitarty key value pair in system
state
+-- | @withSysAttr key value@ : store an arbitrary key value pair in system
state
withSysAttr :: String -> String -> SysConfig
withSysAttr n v = chgS theAttrList (addEntry n v)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/hxt-9.3.1.15/src/Text/XML/HXT/DOM/ShowXml.hs
new/hxt-9.3.1.16/src/Text/XML/HXT/DOM/ShowXml.hs
--- old/hxt-9.3.1.15/src/Text/XML/HXT/DOM/ShowXml.hs 2015-02-06
17:37:11.000000000 +0100
+++ new/hxt-9.3.1.16/src/Text/XML/HXT/DOM/ShowXml.hs 2016-10-18
10:57:47.000000000 +0200
@@ -32,6 +32,7 @@
import Text.XML.HXT.DOM.TypeDefs
import Text.XML.HXT.DOM.XmlKeywords
import Text.XML.HXT.DOM.XmlNode (getDTDAttrl, mkDTDElem)
+import Text.Regex.XMLSchema.Generic(sed)
--
-----------------------------------------------------------------------------
--
@@ -61,12 +62,17 @@
-- a 2. quoting funtion for attribute values
-- and an encoding function after tree conversion
-xshow' :: (Char -> StringFct) -> (Char -> StringFct)
-> (Char -> StringFct) -> XmlTrees -> Blob
+xshow' :: (Char -> StringFct) ->
+ (Char -> StringFct) ->
+ (Char -> StringFct) ->
+ XmlTrees -> Blob
xshow' cquot aquot enc ts = stringToBlob $ (concatMap' enc (showTrees ts
"")) ""
where
showTrees = showXmlTrees (concatMap' cquot) (concatMap'
aquot)
-xshow'' :: (Char -> StringFct) -> (Char -> StringFct)
-> XmlTrees -> String
+xshow'' :: (Char -> StringFct) ->
+ (Char -> StringFct) ->
+ XmlTrees -> String
xshow'' cquot aquot ts = showTrees ts ""
where
showTrees = showXmlTrees (concatMap' cquot) (concatMap'
aquot)
@@ -77,7 +83,9 @@
-- ------------------------------------------------------------
-showXmlTrees :: (String -> StringFct) -> (String ->
StringFct) -> XmlTrees -> StringFct
+showXmlTrees :: (String -> StringFct) ->
+ (String -> StringFct) ->
+ XmlTrees -> StringFct
showXmlTrees cf af
= showTrees
where
@@ -127,7 +135,10 @@
= showString "<!--" . showString c .
showString "-->"
showXmlTree (NTree (XCdata d) _)
- = showString "<![CDATA[" . showString d .
showString "]]>"
+ = showString "<![CDATA[" . showString d' .
showString "]]>"
+ where
+ -- quote "]]>" in CDATA contents
+ d' = sed (const "]]>") "\\]\\]>" d
showXmlTree (NTree (XPi n al) _)
= showString "<?"
@@ -138,8 +149,11 @@
showPiAttr :: XmlTree -> StringFct
showPiAttr a@(NTree (XAttr an) cs)
| qualifiedName an == a_value
- = showBlank . showTrees cs
+ -- <?some-pi ... ?>
+ -- no XML quoting of PI value
+ = showBlank . showXmlTrees
showString showString cs
| otherwise
+ -- <?xml version="..." ... ?>
= showXmlTree a
showPiAttr a
= showXmlTree a -- id
@@ -441,4 +455,3 @@
{-# INLINE concatMap' #-}
--
-----------------------------------------------------------------------------
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/hxt-9.3.1.15/src/Text/XML/HXT/DOM/TypeDefs.hs
new/hxt-9.3.1.16/src/Text/XML/HXT/DOM/TypeDefs.hs
--- old/hxt-9.3.1.15/src/Text/XML/HXT/DOM/TypeDefs.hs 2015-02-06
17:37:11.000000000 +0100
+++ new/hxt-9.3.1.16/src/Text/XML/HXT/DOM/TypeDefs.hs 2016-10-18
09:37:06.000000000 +0200
@@ -75,7 +75,7 @@
| XCdata String -- ^ CDATA
section (leaf)
| XPi QName XmlTrees -- ^
Processing Instr with qualified name (leaf)
-- with list
of attributes.
- -- If tag
name is xml, attributs are \"version\", \"encoding\", \"standalone\",
+ -- If tag
name is xml, attributes are \"version\", \"encoding\", \"standalone\",
-- else
attribute list is empty, content is a text child node
| XTag QName XmlTrees -- ^ tag with
qualified name and list of attributes (inner node or leaf)
| XDTD DTDElem Attributes -- ^ DTD
element with assoc list for dtd element features
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/hxt-9.3.1.15/src/Text/XML/HXT/Parser/HtmlParsec.hs
new/hxt-9.3.1.16/src/Text/XML/HXT/Parser/HtmlParsec.hs
--- old/hxt-9.3.1.15/src/Text/XML/HXT/Parser/HtmlParsec.hs 2015-02-06
17:37:11.000000000 +0100
+++ new/hxt-9.3.1.16/src/Text/XML/HXT/Parser/HtmlParsec.hs 2016-10-18
12:18:17.000000000 +0200
@@ -1,3 +1,5 @@
+{-# LANGUAGE CPP #-}
+
-- ------------------------------------------------------------
{- |
@@ -33,7 +35,10 @@
where
-import Control.Applicative ( (<$>) )
+#if MIN_VERSION_base(4,8,2)
+#else
+import Control.Applicative ((<$>))
+#endif
import Data.Char ( toLower
, toUpper
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/hxt-9.3.1.15/src/Text/XML/HXT/Parser/XmlParsec.hs
new/hxt-9.3.1.16/src/Text/XML/HXT/Parser/XmlParsec.hs
--- old/hxt-9.3.1.15/src/Text/XML/HXT/Parser/XmlParsec.hs 2015-02-06
17:37:11.000000000 +0100
+++ new/hxt-9.3.1.16/src/Text/XML/HXT/Parser/XmlParsec.hs 2016-10-18
12:17:40.000000000 +0200
@@ -1,3 +1,5 @@
+{-# LANGUAGE CPP #-}
+
-- ------------------------------------------------------------
{- |
@@ -58,7 +60,10 @@
)
where
+#if MIN_VERSION_base(4,8,2)
+#else
import Control.Applicative ((<$>))
+#endif
import Text.ParserCombinators.Parsec (between, char, eof,
getInput, getPosition,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hxt-9.3.1.15/src/Text/XML/HXT/Parser/XmlTokenParser.hs
new/hxt-9.3.1.16/src/Text/XML/HXT/Parser/XmlTokenParser.hs
--- old/hxt-9.3.1.15/src/Text/XML/HXT/Parser/XmlTokenParser.hs 2015-02-06
17:37:11.000000000 +0100
+++ new/hxt-9.3.1.16/src/Text/XML/HXT/Parser/XmlTokenParser.hs 2016-10-18
12:15:25.000000000 +0200
@@ -1,3 +1,5 @@
+{-# LANGUAGE CPP #-}
+
-- ------------------------------------------------------------
{- |
@@ -83,7 +85,11 @@
)
where
-import Control.Applicative ( (<$>) )
+#if MIN_VERSION_base(4,8,2)
+#else
+import Control.Applicative ((<$>))
+#endif
+
import Data.Char.Properties.XMLCharProps ( isXmlChar
, isXmlCharCR
@@ -591,7 +597,7 @@
mergeTextNodes :: XmlTrees -> XmlTrees
mergeTextNodes
= foldr addText []
- where
+ where
addText :: XmlTree -> XmlTrees -> XmlTrees
addText t []
= [t]
@@ -599,5 +605,3 @@
= mergeText t t1 ++ ts
-- ------------------------------------------------------------
-
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/hxt-9.3.1.15/src/Text/XML/HXT/Version.hs
new/hxt-9.3.1.16/src/Text/XML/HXT/Version.hs
--- old/hxt-9.3.1.15/src/Text/XML/HXT/Version.hs 2015-02-06
17:37:11.000000000 +0100
+++ new/hxt-9.3.1.16/src/Text/XML/HXT/Version.hs 2016-08-10
09:55:56.000000000 +0200
@@ -1,4 +1,4 @@
module Text.XML.HXT.Version
where
hxt_version :: String
-hxt_version = "9.1.0"
+hxt_version = "9.3.1.15"
