include ghc_pkg_c_deps even when -c option used

This commit is contained in:
Jens Petersen 2011-05-09 18:04:02 +09:00
parent e7f43d8532
commit babb06a261
2 changed files with 5 additions and 2 deletions

View File

@ -146,7 +146,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")}\

View File

@ -1,7 +1,7 @@
%global debug_package %{nil}
Name: ghc-rpm-macros
Version: 0.10.54
Version: 0.10.55
Release: 1%{?dist}
Summary: Macros for building packages for GHC
@ -58,6 +58,9 @@ EOF
%changelog
* Mon May 9 2011 Jens Petersen <petersen@redhat.com> - 0.10.55-1
- include ghc_pkg_c_deps even when -c option used
* Mon May 9 2011 Jens Petersen <petersen@redhat.com> - 0.10.54-1
- ghc-deps.sh: ignore private ghc lib deps
- macros.ghc: drop ghc-prof requires from ghc_prof_requires