From 3be5d738ec2a2d5b9af3d9fc9296de58597824609509a078080d884e8c1b6038 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Fri, 18 Dec 2020 12:53:23 +0000 Subject: [PATCH] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:git-annex revision:59, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/git-annex?expand=0&rev=22 --- git-annex.changes | 5 +++++ git-annex.spec | 9 +++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/git-annex.changes b/git-annex.changes index e800551..d31f0ad 100644 --- a/git-annex.changes +++ b/git-annex.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Oct 17 12:20:00 UTC 2020 - Ondřej Súkup + +- force i686 arch on i586 + ------------------------------------------------------------------- Sun Nov 29 15:48:14 UTC 2020 - psimons@suse.com diff --git a/git-annex.spec b/git-annex.spec index bc4256c..4219f09 100644 --- a/git-annex.spec +++ b/git-annex.spec @@ -127,7 +127,6 @@ BuildRequires: git-core BuildRequires: gpg2 BuildRequires: lsof BuildRequires: rsync -Requires: git-core Requires(post): desktop-file-utils Requires(post): hicolor-icon-theme Requires(postun): desktop-file-utils @@ -138,6 +137,12 @@ Recommends: lsof Recommends: rsync Recommends: ssh Suggests: %{name}-bash-completion +# 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 %description Git-annex allows managing files with git, without checking the file contents @@ -165,7 +170,7 @@ Requires: bash-completion Supplements: (%{name} and bash-completion) %description bash-completion -Optional dependency offering bash completion for git-annex +Optional dependency offering bash completion for git-annex})}} %prep %autosetup