From c8c8b4bab3ac6e764559069cb70ce4511c5073fb44bc407c7fe2af5ae0e856f3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 16 Jun 2018 13:27:52 +0000 Subject: [PATCH 1/4] osc copypac from project:devel:languages:haskell:ghc-8.4.x package:ghc-pandoc-types revision:6, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-pandoc-types?expand=0&rev=55 --- ghc-pandoc-types.spec | 4 +- pandoc-types-1.17.4.2.tar.gz | 3 -- pandoc-types-1.17.5.1.tar.gz | 3 ++ pandoc-types.cabal | 91 ------------------------------------ 4 files changed, 4 insertions(+), 97 deletions(-) delete mode 100644 pandoc-types-1.17.4.2.tar.gz create mode 100644 pandoc-types-1.17.5.1.tar.gz delete mode 100644 pandoc-types.cabal diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index 2148700..af648f8 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.spec @@ -19,14 +19,13 @@ %global pkg_name pandoc-types %bcond_with tests Name: ghc-%{pkg_name} -Version: 1.17.4.2 +Version: 1.17.5.1 Release: 0 Summary: Types for representing a structured document License: GPL-2.0-only Group: Development/Libraries/Haskell 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#/%{pkg_name}.cabal BuildRequires: ghc-Cabal-devel BuildRequires: ghc-QuickCheck-devel BuildRequires: ghc-aeson-devel @@ -76,7 +75,6 @@ This package provides the Haskell %{pkg_name} library development files. %prep %setup -q -n %{pkg_name}-%{version} -cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build diff --git a/pandoc-types-1.17.4.2.tar.gz b/pandoc-types-1.17.4.2.tar.gz deleted file mode 100644 index 29be17e..0000000 --- a/pandoc-types-1.17.4.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:57e15e0a8c74f1acc96259d24eb77a6febbc182a1fd8092af8c431e7a3263eca -size 24035 diff --git a/pandoc-types-1.17.5.1.tar.gz b/pandoc-types-1.17.5.1.tar.gz new file mode 100644 index 0000000..99411c0 --- /dev/null +++ b/pandoc-types-1.17.5.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:271cebd0300e236000c2352d597afe2e72a65bc7b01e32b623e2c868fd12dbe0 +size 24539 diff --git a/pandoc-types.cabal b/pandoc-types.cabal deleted file mode 100644 index 29de62b..0000000 --- a/pandoc-types.cabal +++ /dev/null @@ -1,91 +0,0 @@ -Name: pandoc-types -Version: 1.17.4.2 -x-revision: 1 -Synopsis: Types for representing a structured document -Description: @Text.Pandoc.Definition@ defines the 'Pandoc' data - structure, which is used by pandoc to represent - structured documents. This module used to live - in the pandoc package, but starting with pandoc 1.7, it - has been split off, so that other packages can use it - without drawing in all of pandoc's dependencies, and - pandoc itself can depend on packages (like citeproc-hs) - that use them. - . - @Text.Pandoc.Builder@ provides functions for building - up @Pandoc@ structures programmatically. - . - @Text.Pandoc.Generic@ provides generic functions for - manipulating Pandoc documents. - . - @Text.Pandoc.Walk@ provides faster, nongeneric functions - for manipulating Pandoc documents. - . - @Text.Pandoc.JSON@ provides functions for serializing - and deserializing a @Pandoc@ structure to and from JSON. - -Homepage: http://johnmacfarlane.net/pandoc -License: BSD3 -License-file: LICENSE -Author: John MacFarlane -Maintainer: jgm@berkeley.edu -Bug-Reports: https://github.com/jgm/pandoc-types/issues -Copyright: (c) 2006-2017 John MacFarlane -Category: Text -Build-type: Simple -Cabal-version: >=1.8 -Tested-With: GHC == 7.8.4, GHC == 7.10.3, GHC == 8.0.1 -Extra-Source-Files: changelog -Source-repository head - type: git - location: git://github.com/jgm/pandoc-types.git - -Library - Exposed-modules: Text.Pandoc.Definition - Text.Pandoc.Generic - Text.Pandoc.Walk - Text.Pandoc.Builder - Text.Pandoc.JSON - Text.Pandoc.Arbitrary - Other-modules: Paths_pandoc_types - Build-depends: base >= 4.8 && < 5, - containers >= 0.3, - syb >= 0.1 && < 0.8, - ghc-prim >= 0.2, - bytestring >= 0.9 && < 0.11, - aeson >= 0.6.2 && < 1.4, - transformers >= 0.2 && < 0.6, - QuickCheck >= 2 - if !impl(ghc >= 8.0) - Build-depends: semigroups == 0.18.* - if impl(ghc < 7.10) - Build-depends: deepseq-generics >= 0.1 && < 0.2 - else - Build-depends: deepseq >= 1.4.1 && < 1.5 - ghc-options: -Wall - -test-suite test-pandoc-types - type: exitcode-stdio-1.0 - hs-source-dirs: test - main-is: test-pandoc-types.hs - build-depends: base, - pandoc-types, - syb, - aeson >= 0.6.2 && < 1.4, - containers >= 0.3, - bytestring >= 0.9 && < 0.11, - test-framework >= 0.3 && < 0.9, - test-framework-hunit >= 0.2 && < 0.4, - test-framework-quickcheck2 >= 0.2.9 && < 0.4, - QuickCheck >= 2.4 && < 2.12, - HUnit >= 1.2 && < 1.7, - string-qq == 0.0.2 - ghc-options: -threaded -rtsopts -with-rtsopts=-N -Wall -O2 - -benchmark benchmark-pandoc-types - type: exitcode-stdio-1.0 - main-is: bench.hs - hs-source-dirs: benchmark - build-depends: pandoc-types, - base >= 4.2 && < 5, - criterion >= 1.0 && < 1.5 - ghc-options: -rtsopts -Wall -fno-warn-unused-do-bind -O2 From d53c21e5efdc56da0d57a11dd96d369192c5d770ce3b4878b6744e5d3af4e5df Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 11 Jul 2018 01:01:50 +0000 Subject: [PATCH 2/4] osc copypac from project:devel:languages:haskell:ghc-8.4.x package:ghc-pandoc-types revision:7, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-pandoc-types?expand=0&rev=56 --- ghc-pandoc-types.changes | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/ghc-pandoc-types.changes b/ghc-pandoc-types.changes index a91ab56..fe095af 100644 --- a/ghc-pandoc-types.changes +++ b/ghc-pandoc-types.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Tue Jul 10 18:17:33 UTC 2018 - psimons@suse.com + +- Update pandoc-types to version 1.17.5.1. + [1.17.5.1] + + * Declare the ToMetaValue instance for String as OVERLAPPING (#46). + + [1.17.5] + + + * Bump upper bounds for aeson, base. + * Allow building on older ghc versions (George Wilson). + * Text.Pandoc.Arbitrary: generate SoftBreaks and LineBreaks + (Alexander Krotov). + * Pad table rows up to maximum row length, to guarantee that + all rows have the same number of columns + (see jgm/pandoc#4059, Francesco Occhipinti). + * Make String an instance of ToMetaValue (Alexander Krotov). + ------------------------------------------------------------------- Mon May 14 17:02:11 UTC 2018 - psimons@suse.com From 11d7acc9b94e579adac7e98c58bce2f1f295ea1f5f66294c0c508d14dc5fa26c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 15 Jul 2018 01:01:51 +0000 Subject: [PATCH 3/4] osc copypac from project:devel:languages:haskell:ghc-8.4.x package:ghc-pandoc-types revision:8, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-pandoc-types?expand=0&rev=57 --- ghc-pandoc-types.changes | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ghc-pandoc-types.changes b/ghc-pandoc-types.changes index fe095af..3a4bc12 100644 --- a/ghc-pandoc-types.changes +++ b/ghc-pandoc-types.changes @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Tue Jul 10 18:17:33 UTC 2018 - psimons@suse.com +Fri Jul 13 14:32:07 UTC 2018 - psimons@suse.com - Update pandoc-types to version 1.17.5.1. [1.17.5.1] @@ -8,7 +8,6 @@ Tue Jul 10 18:17:33 UTC 2018 - psimons@suse.com [1.17.5] - * Bump upper bounds for aeson, base. * Allow building on older ghc versions (George Wilson). * Text.Pandoc.Arbitrary: generate SoftBreaks and LineBreaks From 8b85d9d0212a9d63d16f2196f597ef1e0ee6616563da47a6068c48b68215e951 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Jul 2018 14:41:16 +0000 Subject: [PATCH 4/4] osc copypac from project:devel:languages:haskell:ghc-8.4.x package:ghc-pandoc-types revision:9, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-pandoc-types?expand=0&rev=58 --- ghc-pandoc-types.changes | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/ghc-pandoc-types.changes b/ghc-pandoc-types.changes index 3a4bc12..4146d51 100644 --- a/ghc-pandoc-types.changes +++ b/ghc-pandoc-types.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jul 18 14:26:35 UTC 2018 - psimons@suse.com + +- Cosmetic: replace tabs with blanks, strip trailing white space, + and update copyright headers with spec-cleaner. + ------------------------------------------------------------------- Fri Jul 13 14:32:07 UTC 2018 - psimons@suse.com @@ -119,17 +125,17 @@ Sun Sep 27 10:11:48 UTC 2015 - mimi.vx@gmail.com ------------------------------------------------------------------- Sun Jul 19 17:00:25 UTC 2015 - mimi.vx@gmail.com -- update to 1.12.4.5 +- update to 1.12.4.5 ------------------------------------------------------------------- Mon Jun 8 06:39:22 UTC 2015 - mimi.vx@gmail.com -- update to 1.12.4.4 +- update to 1.12.4.4 ------------------------------------------------------------------- Sun May 31 20:49:16 UTC 2015 - mimi.vx@gmail.com -- change license file to COPYING +- change license file to COPYING ------------------------------------------------------------------- Sun May 31 19:58:12 UTC 2015 - mimi.vx@gmail.com @@ -139,7 +145,7 @@ Sun May 31 19:58:12 UTC 2015 - mimi.vx@gmail.com ------------------------------------------------------------------- Thu Apr 23 19:10:59 UTC 2015 - mimi.vx@gmail.com -- update to 1.12.4.2 +- update to 1.12.4.2 ------------------------------------------------------------------- Thu Mar 27 13:59:32 UTC 2014 - sbahling@suse.com @@ -149,55 +155,55 @@ Thu Mar 27 13:59:32 UTC 2014 - sbahling@suse.com ------------------------------------------------------------------- Thu Mar 13 21:51:35 UTC 2014 - sbahling@suse.com -- update to 1.12.3.2 +- update to 1.12.3.2 ------------------------------------------------------------------- Tue Dec 31 16:30:30 UTC 2013 - peter.trommler@ohm-hochschule.de - update to 1.12.3 -- needed for pandoc 1.12.2.1 +- needed for pandoc 1.12.2.1 ------------------------------------------------------------------- Sun Dec 29 16:37:52 UTC 2013 - peter.trommler@ohm-hochschule.de -- merged d:l:haskell changes +- merged d:l:haskell changes ------------------------------------------------------------------- Mon Oct 21 17:14:45 UTC 2013 - peter.trommler@ohm-hochschule.de -- merged defattr change from d:l:h +- merged defattr change from d:l:h ------------------------------------------------------------------- Sun Sep 29 19:48:14 UTC 2013 - sbahling@suse.com -- update to 1.12.1 +- update to 1.12.1 ------------------------------------------------------------------- Tue May 14 13:22:09 UTC 2013 - peter.trommler@ohm-hochschule.de - new cabal-rpm spec file template -* macros not spanning multiple spec file sections +* macros not spanning multiple spec file sections ------------------------------------------------------------------- Fri Jan 25 13:23:53 UTC 2013 - peter.trommler@ohm-hochschule.de - update to 1.10 from upstream -- part of pandoc 1.10 release +- part of pandoc 1.10 release ------------------------------------------------------------------- Tue Jun 5 16:42:19 UTC 2012 - peter.trommler@ohm-hochschule.de -- cabal2spec 0.25.5 template for spec file +- cabal2spec 0.25.5 template for spec file ------------------------------------------------------------------- Tue Mar 13 16:20:59 UTC 2012 - peter.trommler@ohm-hochschule.de -- rpmlint: filter debuginfo warning +- rpmlint: filter debuginfo warning ------------------------------------------------------------------- Mon Mar 12 14:55:45 UTC 2012 - peter.trommler@ohm-hochschule.de -- upgrade to 1.9.1 from upstream +- upgrade to 1.9.1 from upstream ------------------------------------------------------------------- Fri Jan 18 15:35:11 UTC 2012 - herbert@graeber-clan.de