From dd911b2d1fd3ff2ba033097a84da288677d2667335a1b5159bf89f1629caa329 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Fri, 18 Dec 2020 12:51:27 +0000 Subject: [PATCH] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:dhall-json revision:7, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/dhall-json?expand=0&rev=8 --- dhall-json-1.7.3.tar.gz | 3 --- dhall-json-1.7.4.tar.gz | 3 +++ dhall-json.changes | 13 +++++++++++++ dhall-json.spec | 8 +++++++- 4 files changed, 23 insertions(+), 4 deletions(-) delete mode 100644 dhall-json-1.7.3.tar.gz create mode 100644 dhall-json-1.7.4.tar.gz diff --git a/dhall-json-1.7.3.tar.gz b/dhall-json-1.7.3.tar.gz deleted file mode 100644 index 1113a06..0000000 --- a/dhall-json-1.7.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7d8e525dfbbfc7abce0356fff5e3e359e1af68a069c0e383acd667e031b1412b -size 33585 diff --git a/dhall-json-1.7.4.tar.gz b/dhall-json-1.7.4.tar.gz new file mode 100644 index 0000000..20836ac --- /dev/null +++ b/dhall-json-1.7.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c98e13cd6c4cda015bdbbf28b6d64c3f559b149e314577f6db315cb5f9d9f4e3 +size 33597 diff --git a/dhall-json.changes b/dhall-json.changes index 5bd3721..d034ddf 100644 --- a/dhall-json.changes +++ b/dhall-json.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:58 UTC 2020 - psimons@suse.com + +- Update dhall-json to version 1.7.4. + 1.7.4 + + * Build against `dhall-1.37.0` + ------------------------------------------------------------------- Thu Oct 22 02:01:06 UTC 2020 - psimons@suse.com diff --git a/dhall-json.spec b/dhall-json.spec index 147c9b8..f3133e8 100644 --- a/dhall-json.spec +++ b/dhall-json.spec @@ -19,7 +19,7 @@ %global pkg_name dhall-json %bcond_with tests Name: %{pkg_name} -Version: 1.7.3 +Version: 1.7.4 Release: 0 Summary: Convert between Dhall and JSON or YAML License: BSD-3-Clause @@ -45,6 +45,12 @@ BuildRequires: ghc-scientific-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-tasty-devel BuildRequires: ghc-tasty-hunit-devel