From 2d81a3406be0f37b6a3140b5269269542b1638a3348292c717e1949ff2da2e86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 17:49:41 +0000 Subject: [PATCH] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:git-annex revision:67, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/git-annex?expand=0&rev=23 --- git-annex.changes | 2 +- git-annex.spec | 20 +++----------------- 2 files changed, 4 insertions(+), 18 deletions(-) diff --git a/git-annex.changes b/git-annex.changes index d31f0ad..7f671ae 100644 --- a/git-annex.changes +++ b/git-annex.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 ------------------------------------------------------------------- Sun Nov 29 15:48:14 UTC 2020 - psimons@suse.com diff --git a/git-annex.spec b/git-annex.spec index 4219f09..a207e73 100644 --- a/git-annex.spec +++ b/git-annex.spec @@ -137,12 +137,7 @@ 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 +ExcludeArch: %{ix86} %description Git-annex allows managing files with git, without checking the file contents @@ -164,13 +159,12 @@ up and use git-annex this way. %package bash-completion Summary: Bash completion for git-annex -Group: System/Shells Requires: %{name} = %{version} 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 @@ -188,20 +182,12 @@ make DESTDIR=%{buildroot} BUILDER=./Setup install-mans install-completions insta rm %{buildroot}%{_datadir}/fish/vendor_completions.d/git-annex.fish rm %{buildroot}%{_datadir}/zsh/site-functions/_git-annex -%post -%desktop_database_post -%icon_theme_cache_post - -%postun -%desktop_database_postun -%icon_theme_cache_postun - %files %license COPYRIGHT %doc CHANGELOG NEWS README %{_bindir}/%{name} %{_bindir}/%{name}-shell -%{_bindir}/git-remote-tor-annex +%{_bindir}/git-remote-tor-annex} %dir %{_datadir}/icons/hicolor %dir %{_datadir}/icons/hicolor/16x16 %dir %{_datadir}/icons/hicolor/16x16/apps