From e05bdc4f9fb721f657fe3a4f333f1ececa38c995012c2b17954e1a9fef1d87d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Fri, 18 Dec 2020 12:51:28 +0000 Subject: [PATCH 1/3] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:dhall-yaml revision:6, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/dhall-yaml?expand=0&rev=7 --- dhall-yaml-1.2.3.tar.gz | 3 --- dhall-yaml-1.2.4.tar.gz | 3 +++ dhall-yaml.changes | 13 +++++++++++++ dhall-yaml.spec | 8 +++++++- 4 files changed, 23 insertions(+), 4 deletions(-) delete mode 100644 dhall-yaml-1.2.3.tar.gz create mode 100644 dhall-yaml-1.2.4.tar.gz diff --git a/dhall-yaml-1.2.3.tar.gz b/dhall-yaml-1.2.3.tar.gz deleted file mode 100644 index df08d7f..0000000 --- a/dhall-yaml-1.2.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c3551fcc5685d65211aed5ec0d01ff3c2c547506261941fd25cb451f725e82d8 -size 20741 diff --git a/dhall-yaml-1.2.4.tar.gz b/dhall-yaml-1.2.4.tar.gz new file mode 100644 index 0000000..0c8d1cb --- /dev/null +++ b/dhall-yaml-1.2.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4f556e8b47a953af37a9c6985ac525d4b81e11d83ebd72a79903f552a36ea176 +size 20749 diff --git a/dhall-yaml.changes b/dhall-yaml.changes index 52ed79f..d200b18 100644 --- a/dhall-yaml.changes +++ b/dhall-yaml.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Thu Oct 17 12:20:00 UTC 2020 - Ondřej Súkup + +- force i686 arch on i586 + +------------------------------------------------------------------- +Mon Dec 7 06:53:06 UTC 2020 - psimons@suse.com + +- Update dhall-yaml to version 1.2.4. + 1.2.4 + + * Build against `dhall-1.37.0` + ------------------------------------------------------------------- Thu Oct 22 02:00:45 UTC 2020 - psimons@suse.com diff --git a/dhall-yaml.spec b/dhall-yaml.spec index d0edad5..098950d 100644 --- a/dhall-yaml.spec +++ b/dhall-yaml.spec @@ -19,7 +19,7 @@ %global pkg_name dhall-yaml %bcond_with tests Name: %{pkg_name} -Version: 1.2.3 +Version: 1.2.4 Release: 0 Summary: Convert between Dhall and YAML License: GPL-3.0-or-later @@ -41,6 +41,12 @@ BuildRequires: ghc-prettyprinter-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-text-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-tasty-devel BuildRequires: ghc-tasty-expected-failure-devel From 775a8c85ac88b4ad5de27c90c8462ddfd22ab942394fbd293ea104f8fd83e872 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 17:47:26 +0000 Subject: [PATCH 2/3] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:dhall-yaml revision:8, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/dhall-yaml?expand=0&rev=8 --- dhall-yaml.changes | 2 +- dhall-yaml.spec | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dhall-yaml.changes b/dhall-yaml.changes index d200b18..40d9a66 100644 --- a/dhall-yaml.changes +++ b/dhall-yaml.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 ------------------------------------------------------------------- Mon Dec 7 06:53:06 UTC 2020 - psimons@suse.com diff --git a/dhall-yaml.spec b/dhall-yaml.spec index 098950d..bee7f43 100644 --- a/dhall-yaml.spec +++ b/dhall-yaml.spec @@ -41,12 +41,7 @@ BuildRequires: ghc-prettyprinter-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-text-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-tasty-devel BuildRequires: ghc-tasty-expected-failure-devel From 0a5390305a533afb6978dcb6024c3a71e002d30ec0350399f7f1da01dfd73e3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 18:27:49 +0000 Subject: [PATCH 3/3] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:dhall-yaml revision:9, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/dhall-yaml?expand=0&rev=9 --- dhall-yaml.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dhall-yaml.changes b/dhall-yaml.changes index 40d9a66..e0ab4fe 100644 --- a/dhall-yaml.changes +++ b/dhall-yaml.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