From 01e46e802fcb9d9cc17d5ce089fd0a17e32607c46c4159131ad4571e0be6cfe6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Sep 2020 15:03:35 +0000 Subject: [PATCH 1/5] osc copypac from project:devel:languages:haskell:ghc-8.6.x package:ghc-jira-wiki-markup revision:2, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-jira-wiki-markup?expand=0&rev=16 --- ghc-jira-wiki-markup.changes | 114 +--------------------------------- ghc-jira-wiki-markup.spec | 8 ++- jira-wiki-markup-1.0.0.tar.gz | 3 + jira-wiki-markup-1.3.2.tar.gz | 3 - 4 files changed, 9 insertions(+), 119 deletions(-) create mode 100644 jira-wiki-markup-1.0.0.tar.gz delete mode 100644 jira-wiki-markup-1.3.2.tar.gz diff --git a/ghc-jira-wiki-markup.changes b/ghc-jira-wiki-markup.changes index ba39803..5d78a40 100644 --- a/ghc-jira-wiki-markup.changes +++ b/ghc-jira-wiki-markup.changes @@ -1,117 +1,5 @@ -------------------------------------------------------------------- -Tue Aug 18 10:45:15 UTC 2020 - Peter Simons - -- Replace %setup -q with the more modern %autosetup macro. - -------------------------------------------------------------------- -Wed Jul 8 14:05:19 UTC 2020 - psimons@suse.com - -- Update jira-wiki-markup to version 1.3.2. - - * Braces are now always escaped when printing; Jira treats braces - specially, regardless of context. - - * Added support for links to anchors. - - * Styled text may not wrap across multiple lines; linebreaks in - marked-up text are now forbidden. - - * Module Text.Jira.Parser.Core: new function `many1Till` which - behaves like `manyTill`, but requires at least on element to be - parsed. - - * Ensured the package works with GHC 8.10. - - * Support was added for additional syntax constructs: - - - citation markup (`??citation??`), - - links to attachments (`[title^attachment.ext]`), and - - user links (`[~username]`). - - * Changes to module `Text.Jira.Markup`: - - * A new data type `LinkType` is exported from the module. - - * Changes to type `Inline`: - - - a new constructor `Citation` has been added; - - the `Link` constructor now takes an additional - parameter of type `LinkType`. - - * Fixed rendering of image attributes: image attributes are - separated by commas instead of pipes; the latter are used in - block parameters. - - * Fixed parsing of blockquotes which are not preceeded by blank - lines. - - * Ensure parsing of single-line blockquotes is possible even if - there is no space between `bq.` marker and contents. - - * Fixed parsing of colors: parsing no longer fails for hexcolors - which contain non-decimal digits. - - * Changes to module `Text.Jira.Parser.Shared`: - - - New parsing function `colorName` which parses a color - descriptor, i.e. either a name or a hexcolor. - - * Added check that a closing markup char is not preceeded by a - whitespace character. Previously, plain text was still - incorrectly treated as markup. E.g., the dashes in `-> step ->` - used to be interpreted as delimiters marking deleted text. - - * Allows empty table cells; table parsing failed if one of the - cells did not contain any content. - - * Changes to module `Text.Jira.Parser.Core`: - - - A field `stateLastSpcPos` was added to data type - `ParserState` to keep track of spaces. - - Function `updateLastSpcPos` was added to update the - aforementioned field. - - Function `afterSpace` was added to test the field. - -------------------------------------------------------------------- -Tue Jun 16 11:14:18 UTC 2020 - Peter Simons - -- Re-generate file with latest version of spec-cleaner. - -------------------------------------------------------------------- -Wed May 6 06:54:10 UTC 2020 - psimons@suse.com - -- Update jira-wiki-markup to version 1.1.4. - - * Fixed parsing of image parameters. Thumbnails and images with - parameters were previously not recognized as images. - - * Fixed table detection in endOfParagraph parser: Tables were - expected to have a space between the leading pipe(s) and the - cell content. Lines like `||Name|` were erroneously not - recognized as the beginning of a new block. - - * Don't escape colon/semicolon unless necessary: it is necessary - to escape colons or semicolons only if they could otherwise - become part of a smiley. - - * Colon `:` and semicolon `;` are now parsed as special - characters, since they can be the first characters of an emoji. - - * Fixed parsing of words which contain non-special symbol - characters: word boundaries were not set correctly if a word - contained a dot `.` or similar chars. - - * Fixed incorrect emphasis parsing: digits were erroneously allows - as the first characters after closing emphasis characters. - - * Lists are now allowed to be indented; i.e., lists are still - recognized if list markers are preceded by spaces. - - * Support for colored inlines has been added. - - * New constructor `ColorInline` for type `Inline` (API change). - ------------------------------------------------------------------- Thu Dec 26 11:43:38 UTC 2019 - psimons@suse.com - Add jira-wiki-markup at version 1.0.0. + diff --git a/ghc-jira-wiki-markup.spec b/ghc-jira-wiki-markup.spec index 017e28a..c2a4c12 100644 --- a/ghc-jira-wiki-markup.spec +++ b/ghc-jira-wiki-markup.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-jira-wiki-markup # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2019 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 @@ -19,7 +19,7 @@ %global pkg_name jira-wiki-markup %bcond_with tests Name: ghc-%{pkg_name} -Version: 1.3.2 +Version: 1.0.0 Release: 0 Summary: Handle Jira wiki markup License: MIT @@ -52,7 +52,9 @@ This package provides the Haskell %{pkg_name} library development files. %prep -%autosetup -n %{pkg_name}-%{version} +%setup -q -n %{pkg_name}-%{version} +echo > Setup.hs 'import Distribution.Simple' +echo >>Setup.hs 'main = defaultMain' %build %ghc_lib_build diff --git a/jira-wiki-markup-1.0.0.tar.gz b/jira-wiki-markup-1.0.0.tar.gz new file mode 100644 index 0000000..193af92 --- /dev/null +++ b/jira-wiki-markup-1.0.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c8554ef6c2a2bbf8d6c71873f6d69aa6d8f691bb5cf63a46d4c13cac999482ea +size 18697 diff --git a/jira-wiki-markup-1.3.2.tar.gz b/jira-wiki-markup-1.3.2.tar.gz deleted file mode 100644 index 0f3ed24..0000000 --- a/jira-wiki-markup-1.3.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8c0fcc6098751dea0d929587c59eedc937113df9ca089a52de3f63635ff26c9b -size 23081 From c4b4fb12b2e7c8ab965a0955cb4c24a86ac2eea2b17e4ba487f0f229fbda1634 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Sep 2020 15:11:04 +0000 Subject: [PATCH 2/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-jira-wiki-markup revision:17, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-jira-wiki-markup?expand=0&rev=17 --- ghc-jira-wiki-markup.changes | 114 +++++++++++++++++++++++++++++++++- ghc-jira-wiki-markup.spec | 8 +-- jira-wiki-markup-1.0.0.tar.gz | 3 - jira-wiki-markup-1.3.2.tar.gz | 3 + 4 files changed, 119 insertions(+), 9 deletions(-) delete mode 100644 jira-wiki-markup-1.0.0.tar.gz create mode 100644 jira-wiki-markup-1.3.2.tar.gz diff --git a/ghc-jira-wiki-markup.changes b/ghc-jira-wiki-markup.changes index 5d78a40..ba39803 100644 --- a/ghc-jira-wiki-markup.changes +++ b/ghc-jira-wiki-markup.changes @@ -1,5 +1,117 @@ +------------------------------------------------------------------- +Tue Aug 18 10:45:15 UTC 2020 - Peter Simons + +- Replace %setup -q with the more modern %autosetup macro. + +------------------------------------------------------------------- +Wed Jul 8 14:05:19 UTC 2020 - psimons@suse.com + +- Update jira-wiki-markup to version 1.3.2. + + * Braces are now always escaped when printing; Jira treats braces + specially, regardless of context. + + * Added support for links to anchors. + + * Styled text may not wrap across multiple lines; linebreaks in + marked-up text are now forbidden. + + * Module Text.Jira.Parser.Core: new function `many1Till` which + behaves like `manyTill`, but requires at least on element to be + parsed. + + * Ensured the package works with GHC 8.10. + + * Support was added for additional syntax constructs: + + - citation markup (`??citation??`), + - links to attachments (`[title^attachment.ext]`), and + - user links (`[~username]`). + + * Changes to module `Text.Jira.Markup`: + + * A new data type `LinkType` is exported from the module. + + * Changes to type `Inline`: + + - a new constructor `Citation` has been added; + - the `Link` constructor now takes an additional + parameter of type `LinkType`. + + * Fixed rendering of image attributes: image attributes are + separated by commas instead of pipes; the latter are used in + block parameters. + + * Fixed parsing of blockquotes which are not preceeded by blank + lines. + + * Ensure parsing of single-line blockquotes is possible even if + there is no space between `bq.` marker and contents. + + * Fixed parsing of colors: parsing no longer fails for hexcolors + which contain non-decimal digits. + + * Changes to module `Text.Jira.Parser.Shared`: + + - New parsing function `colorName` which parses a color + descriptor, i.e. either a name or a hexcolor. + + * Added check that a closing markup char is not preceeded by a + whitespace character. Previously, plain text was still + incorrectly treated as markup. E.g., the dashes in `-> step ->` + used to be interpreted as delimiters marking deleted text. + + * Allows empty table cells; table parsing failed if one of the + cells did not contain any content. + + * Changes to module `Text.Jira.Parser.Core`: + + - A field `stateLastSpcPos` was added to data type + `ParserState` to keep track of spaces. + - Function `updateLastSpcPos` was added to update the + aforementioned field. + - Function `afterSpace` was added to test the field. + +------------------------------------------------------------------- +Tue Jun 16 11:14:18 UTC 2020 - Peter Simons + +- Re-generate file with latest version of spec-cleaner. + +------------------------------------------------------------------- +Wed May 6 06:54:10 UTC 2020 - psimons@suse.com + +- Update jira-wiki-markup to version 1.1.4. + + * Fixed parsing of image parameters. Thumbnails and images with + parameters were previously not recognized as images. + + * Fixed table detection in endOfParagraph parser: Tables were + expected to have a space between the leading pipe(s) and the + cell content. Lines like `||Name|` were erroneously not + recognized as the beginning of a new block. + + * Don't escape colon/semicolon unless necessary: it is necessary + to escape colons or semicolons only if they could otherwise + become part of a smiley. + + * Colon `:` and semicolon `;` are now parsed as special + characters, since they can be the first characters of an emoji. + + * Fixed parsing of words which contain non-special symbol + characters: word boundaries were not set correctly if a word + contained a dot `.` or similar chars. + + * Fixed incorrect emphasis parsing: digits were erroneously allows + as the first characters after closing emphasis characters. + + * Lists are now allowed to be indented; i.e., lists are still + recognized if list markers are preceded by spaces. + + * Support for colored inlines has been added. + + * New constructor `ColorInline` for type `Inline` (API change). + ------------------------------------------------------------------- Thu Dec 26 11:43:38 UTC 2019 - psimons@suse.com - Add jira-wiki-markup at version 1.0.0. - diff --git a/ghc-jira-wiki-markup.spec b/ghc-jira-wiki-markup.spec index c2a4c12..017e28a 100644 --- a/ghc-jira-wiki-markup.spec +++ b/ghc-jira-wiki-markup.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-jira-wiki-markup # -# 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 @@ -19,7 +19,7 @@ %global pkg_name jira-wiki-markup %bcond_with tests Name: ghc-%{pkg_name} -Version: 1.0.0 +Version: 1.3.2 Release: 0 Summary: Handle Jira wiki markup License: MIT @@ -52,9 +52,7 @@ This package provides the Haskell %{pkg_name} library development files. %prep -%setup -q -n %{pkg_name}-%{version} -echo > Setup.hs 'import Distribution.Simple' -echo >>Setup.hs 'main = defaultMain' +%autosetup -n %{pkg_name}-%{version} %build %ghc_lib_build diff --git a/jira-wiki-markup-1.0.0.tar.gz b/jira-wiki-markup-1.0.0.tar.gz deleted file mode 100644 index 193af92..0000000 --- a/jira-wiki-markup-1.0.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c8554ef6c2a2bbf8d6c71873f6d69aa6d8f691bb5cf63a46d4c13cac999482ea -size 18697 diff --git a/jira-wiki-markup-1.3.2.tar.gz b/jira-wiki-markup-1.3.2.tar.gz new file mode 100644 index 0000000..0f3ed24 --- /dev/null +++ b/jira-wiki-markup-1.3.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8c0fcc6098751dea0d929587c59eedc937113df9ca089a52de3f63635ff26c9b +size 23081 From 5740a0f7ff62a38420845be8cdd8605afe0af9f2d5efd66dc2426e17779ef3fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Fri, 18 Dec 2020 12:52:21 +0000 Subject: [PATCH 3/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-jira-wiki-markup revision:19, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-jira-wiki-markup?expand=0&rev=18 --- ghc-jira-wiki-markup.changes | 5 +++++ ghc-jira-wiki-markup.spec | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/ghc-jira-wiki-markup.changes b/ghc-jira-wiki-markup.changes index ba39803..0d31b87 100644 --- a/ghc-jira-wiki-markup.changes +++ b/ghc-jira-wiki-markup.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Oct 17 12:20:00 UTC 2020 - Ondřej Súkup + +- force i686 arch on i586 + ------------------------------------------------------------------- Tue Aug 18 10:45:15 UTC 2020 - Peter Simons diff --git a/ghc-jira-wiki-markup.spec b/ghc-jira-wiki-markup.spec index 017e28a..99c54a6 100644 --- a/ghc-jira-wiki-markup.spec +++ b/ghc-jira-wiki-markup.spec @@ -31,6 +31,12 @@ BuildRequires: ghc-mtl-devel BuildRequires: ghc-parsec-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-text-devel +# GHC dont support i586 +%ifarch %{ix86} +ExclusiveArch: i586 i686 +ExclusiveArch: i686 +%{expand:%%global optflags %(echo "%{optflags}"|sed -e s/i586/i686/) -march=i686 -mtune=generic} +%endif %if %{with tests} BuildRequires: ghc-tasty-devel BuildRequires: ghc-tasty-hunit-devel From a1bc8b883d85e2e53a4bc9e1de238b332a488628a8fc79eb393c4a79792f5f5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 17:48:20 +0000 Subject: [PATCH 4/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-jira-wiki-markup revision:21, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-jira-wiki-markup?expand=0&rev=19 --- ghc-jira-wiki-markup.changes | 2 +- ghc-jira-wiki-markup.spec | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/ghc-jira-wiki-markup.changes b/ghc-jira-wiki-markup.changes index 0d31b87..1060f7b 100644 --- a/ghc-jira-wiki-markup.changes +++ b/ghc-jira-wiki-markup.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Thu Oct 17 12:20:00 UTC 2020 - Ondřej Súkup -- force i686 arch on i586 +- disable %{ix86} build ------------------------------------------------------------------- Tue Aug 18 10:45:15 UTC 2020 - Peter Simons diff --git a/ghc-jira-wiki-markup.spec b/ghc-jira-wiki-markup.spec index 99c54a6..db8eb07 100644 --- a/ghc-jira-wiki-markup.spec +++ b/ghc-jira-wiki-markup.spec @@ -31,12 +31,7 @@ BuildRequires: ghc-mtl-devel BuildRequires: ghc-parsec-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-text-devel -# GHC dont support i586 -%ifarch %{ix86} -ExclusiveArch: i586 i686 -ExclusiveArch: i686 -%{expand:%%global optflags %(echo "%{optflags}"|sed -e s/i586/i686/) -march=i686 -mtune=generic} -%endif +ExcludeArch: %{ix86} %if %{with tests} BuildRequires: ghc-tasty-devel BuildRequires: ghc-tasty-hunit-devel From d653841c040322aea59b4325a52a363aa11dd45647c1d634697d99805ec45b16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 18:28:48 +0000 Subject: [PATCH 5/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-jira-wiki-markup revision:22, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-jira-wiki-markup?expand=0&rev=20 --- ghc-jira-wiki-markup.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-jira-wiki-markup.changes b/ghc-jira-wiki-markup.changes index 1060f7b..414fb12 100644 --- a/ghc-jira-wiki-markup.changes +++ b/ghc-jira-wiki-markup.changes @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Thu Oct 17 12:20:00 UTC 2020 - Ondřej Súkup +Thu Dec 17 12:20:00 UTC 2020 - Ondřej Súkup - disable %{ix86} build