From a5d27351a75ed2581570505edf16b354a2ec13569914c29c67aad0810adde567 Mon Sep 17 00:00:00 2001 From: Peter Trommler Date: Sat, 2 May 2015 11:04:35 +0000 Subject: [PATCH] Accepting request 305051 from devel:languages:haskell:platform Add missing "Conflicts" tags OBS-URL: https://build.opensuse.org/request/show/305051 OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-bootstrap?expand=0&rev=9 --- ghc-bootstrap.changes | 5 +++++ ghc-bootstrap.spec | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ghc-bootstrap.changes b/ghc-bootstrap.changes index 544288a..fbd8d32 100644 --- a/ghc-bootstrap.changes +++ b/ghc-bootstrap.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri May 1 17:06:42 UTC 2015 - peter.trommler@ohm-hochschule.de + +- add conflicts for new ghc-*-devel packages in ghc 7.8 + ------------------------------------------------------------------- Wed Apr 29 09:55:28 UTC 2015 - peter.trommler@ohm-hochschule.de diff --git a/ghc-bootstrap.spec b/ghc-bootstrap.spec index 3728cbd..a185d2f 100644 --- a/ghc-bootstrap.spec +++ b/ghc-bootstrap.spec @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %ifarch %{ix86} %define longarch i386 %define os_release -centos65 @@ -37,7 +38,6 @@ %global debug_package %{nil} - Name: ghc-bootstrap Version: 7.8.3 Release: 0 @@ -49,8 +49,8 @@ Source: %{name}-%{version}.tar Source1: README.openSUSE Source2: LICENSE BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: gmp-devel BuildRequires: fdupes +BuildRequires: gmp-devel Requires: gmp-devel ExclusiveArch: %{ix86} ppc ppc64 ppc64le x86_64 @@ -68,6 +68,7 @@ Conflicts: ghc-deepseq-devel Conflicts: ghc-directory-devel Conflicts: ghc-filepath-devel Conflicts: ghc-ghc-devel +Conflicts: ghc-haskeline-devel Conflicts: ghc-haskell2010-devel Conflicts: ghc-haskell98-devel Conflicts: ghc-hoopl-devel @@ -77,8 +78,11 @@ Conflicts: ghc-old-time-devel Conflicts: ghc-pretty-devel Conflicts: ghc-process-devel Conflicts: ghc-template-haskell-devel +Conflicts: ghc-terminfo-devel Conflicts: ghc-time-devel +Conflicts: ghc-transformers-devel Conflicts: ghc-unix-devel +Conflicts: ghc-xhtml-devel AutoReq: off