From 6d8c8e6f0c5dbe0885734892a196c1a86c83fa2f Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 17 May 2013 17:51:41 +0900 Subject: [PATCH] drop %ghc_compiler to avoid srpm problems in koji etc --- ghc-rpm-macros.ghc | 2 -- ghc-rpm-macros.ghc-extra | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/ghc-rpm-macros.ghc b/ghc-rpm-macros.ghc index 9504f2a..2e24f6b 100644 --- a/ghc-rpm-macros.ghc +++ b/ghc-rpm-macros.ghc @@ -66,8 +66,6 @@ done\ # compiler version %ghc_version %{!?ghc_version_override:%(ghc --numeric-version)}%{?ghc_version_override} -%ghc_compiler ghc-compiler = %{ghc_version} - # create and install package.conf file # cabal_pkg_conf [name] [version] %cabal_pkg_conf()\ diff --git a/ghc-rpm-macros.ghc-extra b/ghc-rpm-macros.ghc-extra index 1b244b7..50d011e 100644 --- a/ghc-rpm-macros.ghc-extra +++ b/ghc-rpm-macros.ghc-extra @@ -65,9 +65,9 @@ Summary: %{?common_summary}%{!?common_summary:Haskell %{pkgname} library} %{nil} # devel pkg basic requires -%ghc_devel_requires Requires: %{ghc_compiler}\ -Requires(post): %{ghc_compiler}\ -Requires(postun): %{ghc_compiler}\ +%ghc_devel_requires Requires: ghc-compiler = %{ghc_version}\ +Requires(post): ghc-compiler = %{ghc_version}\ +Requires(postun): ghc-compiler = %{ghc_version}\ Requires: ghc-%{?pkg_name}%{!?pkg_name:%{pkgname}} = %{?pkgver}%{!?pkgver:%{version}}-%{release} # ghc_devel_package [-c cdepslist] [-h pkgdepslist] [-l licensetag] [-m] [name] [version]