From 2dafbc455d275876605246f4b8a89c1206082c96 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 12 Jul 2019 14:10:35 +0000 Subject: [PATCH] drop devel %post and %postun (replaced by triggers in ghc-compiler) No longer use %ghc_pkg_c_deps hack to require ghc-compiler = ver-rel - check for ghc_version_override instead --- macros.ghc-extra | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/macros.ghc-extra b/macros.ghc-extra index 9d98fda..3002b81 100644 --- a/macros.ghc-extra +++ b/macros.ghc-extra @@ -35,8 +35,7 @@ Group: Development/Languages/Other\ %endif\ %{?1:Version: %{pkgver}}\ %{-l:License: %{-l*}}\ -Requires(post): %{ghc_prefix}-compiler = %{ghc_version}\ -Requires(postun): %{ghc_prefix}-compiler = %{ghc_version}\ +Requires: %{ghc_prefix}-compiler = %{ghc_version}%{?ghc_version_override:-%{release}}\ Requires: %{ghc_prefix}-%{pkgname}%{?_isa} = %{pkgver}-%{release}\ %{?ghc_pkg_c_deps:Requires: %{ghc_pkg_c_deps}}\ %{-c:Requires: %{-c*}}\ @@ -45,12 +44,6 @@ Requires: %{ghc_prefix}-%{pkgname}%{?_isa} = %{pkgver}-%{release}\ %description -n %{basepkg}-devel\ This package provides the Haskell %{pkgname} library development files.\ \ -%post -n %{basepkg}-devel\ -%ghc_pkg_recache\ -\ -%postun -n %{basepkg}-devel\ -%ghc_pkg_recache\ -\ %files -n %{basepkg} -f %{!-d:%{pkgname}-%{pkgver}/}%{basepkg}.files\ %if 0%{?rhel} && 0%{?rhel} < 6\ %defattr(-,root,root,-)\