From bc693b87049240f7c6d323c0b29311d56d0432ed2d37a26c8be6c0d1b76cb837 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Sep 2020 15:03:16 +0000 Subject: [PATCH 1/6] osc copypac from project:devel:languages:haskell:ghc-8.6.x package:ghc-doctemplates revision:10, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-doctemplates?expand=0&rev=38 --- doctemplates-0.8.2.tar.gz | 3 --- doctemplates-0.8.tar.gz | 3 +++ ghc-doctemplates.changes | 31 ------------------------------- ghc-doctemplates.spec | 6 +++--- 4 files changed, 6 insertions(+), 37 deletions(-) delete mode 100644 doctemplates-0.8.2.tar.gz create mode 100644 doctemplates-0.8.tar.gz diff --git a/doctemplates-0.8.2.tar.gz b/doctemplates-0.8.2.tar.gz deleted file mode 100644 index 33515ad..0000000 --- a/doctemplates-0.8.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f463b2309e19918a58b1e53740bee4b98ab274549e49e4455dce824b49adbe93 -size 26780 diff --git a/doctemplates-0.8.tar.gz b/doctemplates-0.8.tar.gz new file mode 100644 index 0000000..0ad499a --- /dev/null +++ b/doctemplates-0.8.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d61a1a30c7c10a78d5d61f3a8883d2fa95116674be1493ad819e01b86e83167e +size 26396 diff --git a/ghc-doctemplates.changes b/ghc-doctemplates.changes index d982389..1f92b77 100644 --- a/ghc-doctemplates.changes +++ b/ghc-doctemplates.changes @@ -1,34 +1,3 @@ -------------------------------------------------------------------- -Tue Aug 18 10:44:41 UTC 2020 - Peter Simons - -- Replace %setup -q with the more modern %autosetup macro. - -------------------------------------------------------------------- -Tue Jun 16 11:14:03 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 doctemplates to version 0.8.2. - ## 0.8.2 - - * Add filters: first, rest, last, allbutlast. - - * New constructors for Filter: FirstItem, LastItem, Rest, AllButLast - [API change]. - -------------------------------------------------------------------- -Thu Feb 27 16:05:49 UTC 2020 - psimons@suse.com - -- Update doctemplates to version 0.8.1. - ## 0.8.1 - - * Depend on doclayout 0.3, which adds an additional method - on the HasChars class. This fixes some stack overflows - in rendering very long lines. - ------------------------------------------------------------------- Mon Dec 23 17:45:39 UTC 2019 - psimons@suse.com diff --git a/ghc-doctemplates.spec b/ghc-doctemplates.spec index 981d755..ab7bc44 100644 --- a/ghc-doctemplates.spec +++ b/ghc-doctemplates.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-doctemplates # -# 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 doctemplates %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.8.2 +Version: 0.8 Release: 0 Summary: Pandoc-style document templates License: BSD-3-Clause @@ -66,7 +66,7 @@ Requires(postun): ghc-compiler = %{ghc_version} This package provides the Haskell %{pkg_name} library development files. %prep -%autosetup -n %{pkg_name}-%{version} +%setup -q -n %{pkg_name}-%{version} %build %ghc_lib_build From 2cbd0eca772204515a3d2a08600473d5f7747d5f950f5974a69479ae45763772 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Sep 2020 15:10:24 +0000 Subject: [PATCH 2/6] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-doctemplates revision:8, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-doctemplates?expand=0&rev=39 --- doctemplates-0.8.2.tar.gz | 3 +++ doctemplates-0.8.tar.gz | 3 --- ghc-doctemplates.changes | 31 +++++++++++++++++++++++++++++++ ghc-doctemplates.spec | 6 +++--- 4 files changed, 37 insertions(+), 6 deletions(-) create mode 100644 doctemplates-0.8.2.tar.gz delete mode 100644 doctemplates-0.8.tar.gz diff --git a/doctemplates-0.8.2.tar.gz b/doctemplates-0.8.2.tar.gz new file mode 100644 index 0000000..33515ad --- /dev/null +++ b/doctemplates-0.8.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f463b2309e19918a58b1e53740bee4b98ab274549e49e4455dce824b49adbe93 +size 26780 diff --git a/doctemplates-0.8.tar.gz b/doctemplates-0.8.tar.gz deleted file mode 100644 index 0ad499a..0000000 --- a/doctemplates-0.8.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d61a1a30c7c10a78d5d61f3a8883d2fa95116674be1493ad819e01b86e83167e -size 26396 diff --git a/ghc-doctemplates.changes b/ghc-doctemplates.changes index 1f92b77..d982389 100644 --- a/ghc-doctemplates.changes +++ b/ghc-doctemplates.changes @@ -1,3 +1,34 @@ +------------------------------------------------------------------- +Tue Aug 18 10:44:41 UTC 2020 - Peter Simons + +- Replace %setup -q with the more modern %autosetup macro. + +------------------------------------------------------------------- +Tue Jun 16 11:14:03 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 doctemplates to version 0.8.2. + ## 0.8.2 + + * Add filters: first, rest, last, allbutlast. + + * New constructors for Filter: FirstItem, LastItem, Rest, AllButLast + [API change]. + +------------------------------------------------------------------- +Thu Feb 27 16:05:49 UTC 2020 - psimons@suse.com + +- Update doctemplates to version 0.8.1. + ## 0.8.1 + + * Depend on doclayout 0.3, which adds an additional method + on the HasChars class. This fixes some stack overflows + in rendering very long lines. + ------------------------------------------------------------------- Mon Dec 23 17:45:39 UTC 2019 - psimons@suse.com diff --git a/ghc-doctemplates.spec b/ghc-doctemplates.spec index ab7bc44..981d755 100644 --- a/ghc-doctemplates.spec +++ b/ghc-doctemplates.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-doctemplates # -# 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 doctemplates %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.8 +Version: 0.8.2 Release: 0 Summary: Pandoc-style document templates License: BSD-3-Clause @@ -66,7 +66,7 @@ Requires(postun): ghc-compiler = %{ghc_version} This package provides the Haskell %{pkg_name} library development files. %prep -%setup -q -n %{pkg_name}-%{version} +%autosetup -n %{pkg_name}-%{version} %build %ghc_lib_build From 0189dc61961268fac9d477fb60fe9978897df664f897268f516f9a6e6e625b2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Wed, 2 Dec 2020 15:03:31 +0000 Subject: [PATCH 3/6] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-doctemplates revision:9, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-doctemplates?expand=0&rev=40 --- doctemplates-0.8.2.tar.gz | 3 --- doctemplates-0.8.3.tar.gz | 3 +++ ghc-doctemplates.changes | 24 ++++++++++++++++++++++++ ghc-doctemplates.spec | 2 +- 4 files changed, 28 insertions(+), 4 deletions(-) delete mode 100644 doctemplates-0.8.2.tar.gz create mode 100644 doctemplates-0.8.3.tar.gz diff --git a/doctemplates-0.8.2.tar.gz b/doctemplates-0.8.2.tar.gz deleted file mode 100644 index 33515ad..0000000 --- a/doctemplates-0.8.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f463b2309e19918a58b1e53740bee4b98ab274549e49e4455dce824b49adbe93 -size 26780 diff --git a/doctemplates-0.8.3.tar.gz b/doctemplates-0.8.3.tar.gz new file mode 100644 index 0000000..58803dc --- /dev/null +++ b/doctemplates-0.8.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:edbafd7e94da3cba39e79ba1596c2e8efb745bea0792b0e7c756fbe08467ff5f +size 27191 diff --git a/ghc-doctemplates.changes b/ghc-doctemplates.changes index d982389..462cbc0 100644 --- a/ghc-doctemplates.changes +++ b/ghc-doctemplates.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Tue Dec 1 08:09:40 UTC 2020 - psimons@suse.com + +- Update doctemplates to version 0.8.3. + ## 0.8.3 + + * Properly handle nested loops (#15). Previously "it" was + always used for the variable in a loop, and in a nested loop + there was no way to distinguish the value of the inner + iteration from the value of the outer one. Now we assign + the iterated value to both "it" and to the original variable + name (e.g. "foo.bar"). This probably has a small negative + performance impact. Note that this change also affects + the output of the template parser: original variable + names are now retained instead of being replaced by "it". + + * Remove duplicate IsString constraint (#14, Mario Lang). + + * Update haddocks from README (#10). + + * Minor code clean-ups (#7, favonia). + + * Add hsyaml >= 0.2 constraint (#6). + ------------------------------------------------------------------- Tue Aug 18 10:44:41 UTC 2020 - Peter Simons diff --git a/ghc-doctemplates.spec b/ghc-doctemplates.spec index 981d755..5651942 100644 --- a/ghc-doctemplates.spec +++ b/ghc-doctemplates.spec @@ -19,7 +19,7 @@ %global pkg_name doctemplates %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.8.2 +Version: 0.8.3 Release: 0 Summary: Pandoc-style document templates License: BSD-3-Clause From 87b60201d43dd6d9d020cf9e187fba768a88eea176cea28bb925e3f67b9feb4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Fri, 18 Dec 2020 12:52:01 +0000 Subject: [PATCH 4/6] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-doctemplates revision:12, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-doctemplates?expand=0&rev=41 --- doctemplates-0.8.3.tar.gz | 3 --- doctemplates-0.9.tar.gz | 3 +++ ghc-doctemplates.changes | 21 +++++++++++++++++++++ ghc-doctemplates.spec | 8 +++++++- 4 files changed, 31 insertions(+), 4 deletions(-) delete mode 100644 doctemplates-0.8.3.tar.gz create mode 100644 doctemplates-0.9.tar.gz diff --git a/doctemplates-0.8.3.tar.gz b/doctemplates-0.8.3.tar.gz deleted file mode 100644 index 58803dc..0000000 --- a/doctemplates-0.8.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:edbafd7e94da3cba39e79ba1596c2e8efb745bea0792b0e7c756fbe08467ff5f -size 27191 diff --git a/doctemplates-0.9.tar.gz b/doctemplates-0.9.tar.gz new file mode 100644 index 0000000..8a47c1c --- /dev/null +++ b/doctemplates-0.9.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:da262ec09d0689c27a79589d2abecb03609ef3925a4dde3b70012682d4441011 +size 27366 diff --git a/ghc-doctemplates.changes b/ghc-doctemplates.changes index 462cbc0..0b35eea 100644 --- a/ghc-doctemplates.changes +++ b/ghc-doctemplates.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Thu Oct 17 12:20:00 UTC 2020 - Ondřej Súkup + +- force i686 arch on i586 + +------------------------------------------------------------------- +Thu Dec 17 10:46:40 UTC 2020 - psimons@suse.com + +- Update doctemplates to version 0.9. + ## 0.9 + + * Add BoolVal constructor to Val. This gives a smoother + interface with JSON and YAML. [API change] + + * Remove overlapping instances by generalizing + `ToContext String String` and `FromContext String String` + to `TemplateTarget [a] => ToContext [a] [a]` and + `TemplateTarget [a] => FromContext [a] [a]`. + Remove the instance `ToContext String (Doc String)`. + Remove redundant constraints. (#9, favonia) [API change] + ------------------------------------------------------------------- Tue Dec 1 08:09:40 UTC 2020 - psimons@suse.com diff --git a/ghc-doctemplates.spec b/ghc-doctemplates.spec index 5651942..d6ec9cf 100644 --- a/ghc-doctemplates.spec +++ b/ghc-doctemplates.spec @@ -19,7 +19,7 @@ %global pkg_name doctemplates %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.8.3 +Version: 0.9 Release: 0 Summary: Pandoc-style document templates License: BSD-3-Clause @@ -40,6 +40,12 @@ BuildRequires: ghc-text-conversions-devel BuildRequires: ghc-text-devel BuildRequires: ghc-unordered-containers-devel BuildRequires: ghc-vector-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-Glob-devel BuildRequires: ghc-bytestring-devel From 0f178e826a6608852d6af707ed0a09f52d701db4155c32d016934974516c4c63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 17:47:58 +0000 Subject: [PATCH 5/6] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-doctemplates revision:14, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-doctemplates?expand=0&rev=42 --- ghc-doctemplates.changes | 2 +- ghc-doctemplates.spec | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/ghc-doctemplates.changes b/ghc-doctemplates.changes index 0b35eea..31ff8c9 100644 --- a/ghc-doctemplates.changes +++ b/ghc-doctemplates.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 ------------------------------------------------------------------- Thu Dec 17 10:46:40 UTC 2020 - psimons@suse.com diff --git a/ghc-doctemplates.spec b/ghc-doctemplates.spec index d6ec9cf..7b7b8cd 100644 --- a/ghc-doctemplates.spec +++ b/ghc-doctemplates.spec @@ -40,12 +40,7 @@ BuildRequires: ghc-text-conversions-devel BuildRequires: ghc-text-devel BuildRequires: ghc-unordered-containers-devel BuildRequires: ghc-vector-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-Glob-devel BuildRequires: ghc-bytestring-devel From 1585a17678c55ed2e59a84dcc3294d56f7e5dcab19829875318a40fdec5b94ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 18:28:27 +0000 Subject: [PATCH 6/6] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-doctemplates revision:15, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-doctemplates?expand=0&rev=43 --- ghc-doctemplates.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-doctemplates.changes b/ghc-doctemplates.changes index 31ff8c9..05fcddc 100644 --- a/ghc-doctemplates.changes +++ b/ghc-doctemplates.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