From ff7270f82db60a6e4c1618d59af9fb83a3facda3 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 10 Oct 2017 15:44:05 +0800 Subject: [PATCH] drop the git-annex obsoletes --- ghc-rpm-macros.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index dd959d3..368026b 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -11,7 +11,7 @@ Name: ghc-rpm-macros Version: 1.6.50 -Release: 1%{?dist} +Release: 2%{?dist} Summary: RPM macros for building Haskell packages for GHC License: GPLv3+ @@ -95,7 +95,6 @@ Obsoletes: ghc-sized-types <= 0.3.4.0, ghc-sized-types-devel <= 0.3.4.0 # dropped from HP 8.0.2 Obsoletes: ghc-cgi < 3001.2.2.2-5, ghc-cgi-devel < 3001.2.2.2-5 Obsoletes: ghc-multipart < 0.1.2-5, ghc-multipart-devel < 0.1.2-5 -Obsoletes: git-annex <= 5.20140717 %endif %description -n ghc-obsoletes @@ -162,6 +161,9 @@ EOF %changelog +* Tue Oct 10 2017 Jens Petersen - 1.6.50-2 +- drop the git-annex obsoletes + * Wed Sep 13 2017 Jens Petersen - 1.6.50-1 - make some macro call args explicit for rpm-4.14 scope change (this breaks builds with earlier versions of rpm)