Hello community,
here is the log from the commit of package ghc-taggy for openSUSE:Factory
checked in at 2017-08-31 20:49:45
Comparing /work/SRC/openSUSE:Factory/ghc-taggy (Old)
and /work/SRC/openSUSE:Factory/.ghc-taggy.new (New)
Package is "ghc-taggy"
Thu Aug 31 20:49:45 2017 rev:2 rq:513722 version:0.2.0
Changes:
--- /work/SRC/openSUSE:Factory/ghc-taggy/ghc-taggy.changes 2017-03-24
01:58:23.785566250 +0100
+++ /work/SRC/openSUSE:Factory/.ghc-taggy.new/ghc-taggy.changes 2017-08-31
20:49:46.447787356 +0200
@@ -1,0 +2,6 @@
+Tue Aug 1 15:14:00 UTC 2017 - psim...@suse.com
+
+- Apply "fix-lts-9-build.patch" from upstream to add support for
+ recent versions of blaze-markup.
+
+---
Old:
1.cabal
New:
fix-lts-9-build.patch
taggy.cabal
Other differences:
--
++ ghc-taggy.spec ++
--- /var/tmp/diff_new_pack.aivjT4/_old 2017-08-31 20:49:47.883585814 +0200
+++ /var/tmp/diff_new_pack.aivjT4/_new 2017-08-31 20:49:47.911581884 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ghc-taggy
#
-# 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
@@ -26,7 +26,8 @@
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/1.cabal
+Source1:
https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal#/%{pkg_name}.cabal
+Patch1: fix-lts-9-build.patch
BuildRequires: chrpath
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-attoparsec-devel
@@ -89,13 +90,14 @@
%prep
%setup -q -n %{pkg_name}-%{version}
cp -p %{SOURCE1} %{pkg_name}.cabal
+%patch1 -p1
%build
%ghc_lib_build
%install
%ghc_lib_install
-%ghc_fix_dynamic_rpath %{pkg_name}
+%ghc_fix_rpath %{pkg_name}-%{version}
%check
%cabal_test
++ fix-lts-9-build.patch ++
>From 5456c2fa4d377f7802ec5df3d5f50c4ccab2e8ed Mon Sep 17 00:00:00 2001
From: vi
Date: Fri, 28 Jul 2017 19:00:23 +0200
Subject: [PATCH] Build compatability with blaze-markup 0.8.0.0.
Resolves #19.
Resolves #20.
---
src/Text/Taggy/Renderer.hs | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/Text/Taggy/Renderer.hs b/src/Text/Taggy/Renderer.hs
index d1d3486..a931905 100644
--- a/src/Text/Taggy/Renderer.hs
+++ b/src/Text/Taggy/Renderer.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE LambdaCase, RecordWildCards, FlexibleInstances,
UndecidableInstances, OverloadedStrings #-}
+{-# LANGUAGE CPP, LambdaCase, RecordWildCards, FlexibleInstances,
UndecidableInstances, OverloadedStrings #-}
-- |
-- Module : Text.Taggy.Renderer
-- Copyright: (c) 2014 Alp Mestanogullari, Vikram Verma
@@ -33,7 +33,13 @@ class AsMarkup a where
-- | A 'Node' is convertible to 'Markup'
instance AsMarkup Node where
toMarkup convertEntities = \case
-NodeContent text -> Content $ if convertEntities then Text text else
PreEscaped (Text text)
+#if MIN_VERSION_blaze_markup(0,8,0)
+NodeContent text -> flip Content () $
+#else
+NodeContent text -> Content $
+#endif
+ if convertEntities then Text text else PreEscaped (Text text)
+
NodeElement elmt -> toMarkup convertEntities elmt
-- | An 'Element' is convertible to 'Markup'
++ taggy.cabal ++
name:taggy
version: 0.2.0
x-revision: 1
synopsis:Efficient and simple HTML/XML parsing library
description:
/taggy/ is a simple package for parsing HTML (and should work with XML)
written on top of the
library, which makes it one of the most efficient (space and time consumption
wise)
on hackage.
.
This is the root module of /taggy/. It reexports everything
from the package. See each module's docs for details about
the functions and types involved in /taggy/.
.
While we've been testing the parser on /many/ pages, it may still
be a bit rough around the edges. Let us know on
if you have any problem.
.
If you like to look at your HTML through
various optical instruments, feel free to take a look at
the companion
package we've put up together. It makes HTML parsing a piece of cake.
.
If you want to parse a document
