[ghc-rpm-macros] include ghc_pkg_c_deps even when -c option used

Jens Petersen petersen at fedoraproject.org
Mon May 9 09:56:49 UTC 2011


commit eab5583c0dcf11c975b5f1f97b70774f923dfed4
Author: Jens Petersen <petersen at redhat.com>
Date:   Mon May 9 18:56:37 2011 +0900

    include ghc_pkg_c_deps even when -c option used

 ghc-rpm-macros.ghc  |    2 +-
 ghc-rpm-macros.spec |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/ghc-rpm-macros.ghc b/ghc-rpm-macros.ghc
index 9ed4692..9a0a97c 100644
--- a/ghc-rpm-macros.ghc
+++ b/ghc-rpm-macros.ghc
@@ -156,7 +156,7 @@ Group:          Development/Libraries\
 %{-l:License:        %{-l*}}\
 %{?ghc_devel_requires}\
 %{-h:Requires:       %{-h*}}\
-%{!-c:%{?ghc_pkg_c_deps:Requires:       %{ghc_pkg_c_deps}}}\
+%{?ghc_pkg_c_deps:Requires:       %{ghc_pkg_c_deps}}\
 %{-c:Requires:       %{-c*}}\
 %{?ghc_pkg_obsoletes:Obsoletes:      %{ghc_pkg_obsoletes}}\
 %{?ghc_pkg_obsoletes:Obsoletes:      %(echo "%{ghc_pkg_obsoletes}" | sed -e "s/\\(ghc-[^, ]*\\)-devel/\\1-doc/g")}\
diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index 4544177..ced65f4 100644
--- a/ghc-rpm-macros.spec
+++ b/ghc-rpm-macros.spec
@@ -1,7 +1,7 @@
 %global debug_package %{nil}
 
 Name:		ghc-rpm-macros
-Version:	0.12.0
+Version:	0.12.1
 Release:	1%{?dist}
 Summary:	Macros for building packages for GHC
 
@@ -58,6 +58,9 @@ EOF
 
 
 %changelog
+* Mon May  9 2011 Jens Petersen <petersen at redhat.com> - 0.12.1-1
+- include ghc_pkg_c_deps even when -c option used
+
 * Sat May  7 2011 Jens Petersen <petersen at redhat.com> - 0.12.0-1
 - drop ghc_pkg_deps from ghc_package_devel and ghc_package_prof since
   ghc-deps.sh generates better inter-package dependencies already


More information about the scm-commits mailing list