From 562d56b2379e00e06461354a6bb881983a708847a4e191acd4a42af4cdd3f2db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Fri, 18 Dec 2020 12:52:30 +0000 Subject: [PATCH] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-lens-aeson revision:4, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-lens-aeson?expand=0&rev=2 --- ghc-lens-aeson.changes | 11 +++++++++++ ghc-lens-aeson.spec | 8 +++++++- lens-aeson.cabal | 4 ++-- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/ghc-lens-aeson.changes b/ghc-lens-aeson.changes index 69f6197..26d8ff7 100644 --- a/ghc-lens-aeson.changes +++ b/ghc-lens-aeson.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Oct 17 12:20:00 UTC 2020 - Ondřej Súkup + +- force i686 arch on i586 + +------------------------------------------------------------------- +Thu Dec 17 10:46:18 UTC 2020 - psimons@suse.com + +- Update lens-aeson to version 1.1 revision 3. + Upstream has revised the Cabal build instructions on Hackage. + ------------------------------------------------------------------- Sun Nov 29 18:14:48 UTC 2020 - psimons@suse.com diff --git a/ghc-lens-aeson.spec b/ghc-lens-aeson.spec index 2f1c184..407d38b 100644 --- a/ghc-lens-aeson.spec +++ b/ghc-lens-aeson.spec @@ -25,7 +25,7 @@ Summary: Law-abiding lenses for aeson License: MIT 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/2.cabal#/%{pkg_name}.cabal +Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/3.cabal#/%{pkg_name}.cabal BuildRequires: ghc-Cabal-devel BuildRequires: ghc-aeson-devel BuildRequires: ghc-attoparsec-devel @@ -37,6 +37,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-doctest-devel BuildRequires: ghc-generic-deriving-devel diff --git a/lens-aeson.cabal b/lens-aeson.cabal index deab4e6..5b9ca4f 100644 --- a/lens-aeson.cabal +++ b/lens-aeson.cabal @@ -1,7 +1,7 @@ name: lens-aeson category: Numeric version: 1.1 -x-revision: 2 +x-revision: 3 license: MIT cabal-version: >= 1.8 license-file: LICENSE @@ -61,7 +61,7 @@ library vector >= 0.9 && < 0.13, unordered-containers >= 0.2.3 && < 0.3, attoparsec >= 0.10 && < 0.14, - bytestring >= 0.9 && < 0.11, + bytestring >= 0.9 && < 0.12, aeson >= 0.7.0.5 && < 1.6, scientific >= 0.3.2 && < 0.4