diff --git a/ghc-rpm-macros.ghc b/ghc-rpm-macros.ghc index d5f45ed..13879bf 100644 --- a/ghc-rpm-macros.ghc +++ b/ghc-rpm-macros.ghc @@ -102,7 +102,7 @@ install --mode=0644 %{pkgnamever}.conf %{buildroot}%{ghclibdir}/package.conf.d\ %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}\ +%if %{undefined ghc_without_shared} && 0%{!?-m:1}\ Requires: ghc-%{?pkg_name}%{!?pkg_name:%{pkgname}} = %{?pkgver}%{!?pkgver:%{version}}-%{release}\ %endif @@ -179,8 +179,9 @@ This package provides the shared library.\ %ghc_devel_files\ %{nil} -# ghc_devel_package [-c cdepslist] [-h pkgdepslist] [-l licensetag] [name] [version] -%ghc_devel_package(c:h:l:)\ +# ghc_devel_package [-c cdepslist] [-h pkgdepslist] [-l licensetag] [-m] [name] [version] +# -m : meta-package +%ghc_devel_package(c:h:l:m)\ %define pkgname %{?1}%{!?1:%{pkg_name}}\ %define pkgver %{?2}%{!?2:%{version}}\ %define basepkg ghc-%{pkgname}\ diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 06c9bb9..f23cdd3 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.95 +Version: 0.95.1 Release: 1%{?dist} Summary: Macros for building packages for GHC @@ -60,6 +60,9 @@ EOF %changelog +* Fri Jun 8 2012 Jens Petersen - 0.95.1-1 +- add a meta-package option to ghc_devel_package and use in ghc_devel_requires + * Thu Jun 7 2012 Jens Petersen - 0.95-1 - let ghc_bin_install take an arg to disable implicit stripping for subpackages