[ghc-rpm-macros] replace devel ghc requires with ghc-compiler

Jens Petersen petersen at fedoraproject.org
Tue Nov 1 12:18:52 UTC 2011


commit 7229f10396a5392b03dd778304b59adfc4c72e48
Author: Jens Petersen <petersen at redhat.com>
Date:   Tue Nov 1 21:18:49 2011 +0900

    replace devel ghc requires with ghc-compiler

 ghc-rpm-macros.ghc  |    6 +++---
 ghc-rpm-macros.spec |    6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/ghc-rpm-macros.ghc b/ghc-rpm-macros.ghc
index 98cda6c..0ecb69c 100644
--- a/ghc-rpm-macros.ghc
+++ b/ghc-rpm-macros.ghc
@@ -84,9 +84,9 @@ install --mode=0644 %{pkgnamever}.conf %{buildroot}%{ghclibdir}/package.conf.d\
 %{nil}
 
 # devel pkg basic requires
-%ghc_devel_requires Requires:       ghc = %{ghc_version}\
-Requires(post): ghc = %{ghc_version}\
-Requires(postun): ghc = %{ghc_version}\
+%ghc_devel_requires Requires:       ghc-compiler = %{ghc_version}\
+Requires(post): ghc-compiler = %{ghc_version}\
+Requires(postun): ghc-compiler = %{ghc_version}\
 %if %{undefined ghc_without_shared}\
 Requires:       ghc-%{?pkg_name}%{!?pkg_name:%{pkgname}} = %{?pkgver}%{!?pkgver:%{version}}-%{release}\
 %endif
diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index 457a63a..0279b3a 100644
--- a/ghc-rpm-macros.spec
+++ b/ghc-rpm-macros.spec
@@ -3,7 +3,7 @@
 %global macros_file %{_sysconfdir}/rpm/macros.ghc
 
 Name:           ghc-rpm-macros
-Version:        0.13.13
+Version:        0.14
 Release:        1%{?dist}
 Summary:        Macros for building packages for GHC
 
@@ -53,13 +53,15 @@ EOF
 
 
 %files
-%defattr(-,root,root,-)
 %doc COPYING AUTHORS
 %config(noreplace) %{macros_file}
 %{_prefix}/lib/rpm/ghc-deps.sh
 
 
 %changelog
+* Tue Nov  1 2011 Jens Petersen <petersen at redhat.com> - 0.14-1
+- replace devel ghc requires with ghc-compiler
+
 * Mon Oct 17 2011 Jens Petersen <petersen at redhat.com> - 0.13.13-1
 - add ghc_bootstrapping to ghc_bootstrap for packages other than ghc
 - make ghc-deps.sh also work when bootstrapping a new ghc version


More information about the scm-commits mailing list