From 2c8bb831fa90373e3b350828c51a29c102865c91 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 21 Jul 2020 18:15:30 +0800 Subject: [PATCH] obsoletes for ghc-gtksourceview2 (and drop ghc-cabal-helper) --- ghc-rpm-macros.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 7d48bca..61f3c89 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -10,7 +10,7 @@ #%%global without_hscolour 1 Name: ghc-rpm-macros -Version: 2.0.11 +Version: 2.0.12 Release: 1%{?dist} Summary: RPM macros for building Haskell packages for GHC @@ -137,11 +137,13 @@ Obsoletes: ghc-conduit-combinators < 1.3.1 Obsoletes: ghc-conduit-combinators-devel < 1.3.1 %endif %if 0%{?fedora} >= 32 -Obsoletes: ghc-cabal-helper < 0.8.2.0-5, ghc-cabal-helper-devel < 0.8.2.0-5, ghc-cabal-helper-prof < 0.8.2.0-5 Obsoletes: ghc-cabal-plan < 0.4.0.0-5, ghc-cabal-plan-devel < 0.4.0.0-5, ghc-cabal-plan-prof < 0.4.0.0-5 Obsoletes: ghc-derive < 2.6.5-5, ghc-derive-devel < 2.6.5-5, ghc-derive-prof < 2.6.5-5 Obsoletes: ghc-here < 1.2.13-17, ghc-here-devel < 1.2.13-17, ghc-here-prof < 1.2.13-17 %endif +%if 0%{?fedora} >= 33 +Obsoletes: ghc-gtksourceview2 < 0.13.3.1-14, ghc-gtksourceview2-devel < 0.13.3.1-14, ghc-gtksourceview2-prof < 0.13.3.1-14 +%endif %description -n ghc-obsoletes Meta package for obsoleting deprecated Haskell packages. @@ -212,6 +214,9 @@ EOF %changelog +* Tue Jul 21 2020 Jens Petersen - 2.0.12-1 +- obsoletes for ghc-gtksourceview2 + * Wed Jun 24 2020 Jens Petersen - 2.0.11-1 - handle meta subpackages: - ghc_lib_subpackage -m