diff --git a/ghc-rpm-macros.ghc b/ghc-rpm-macros.ghc index 579aa18..97abdf6 100644 --- a/ghc-rpm-macros.ghc +++ b/ghc-rpm-macros.ghc @@ -135,7 +135,7 @@ Group: System Environment/Libraries\ %{?ghc_pkg_obsoletes:Obsoletes: %(echo "%{ghc_pkg_obsoletes}" | sed -e "s/\\(ghc-[^, ]*\\)-devel/\\1/g")} # ghc_description [name] [version] -%ghc_description\ +%ghc_description()\ %define pkgname %{?1}%{!?1:%{pkg_name}}\ %define basepkg ghc-%{pkgname}\ %description -n %{basepkg}\ @@ -202,7 +202,7 @@ Provides: %{basepkg}-prof = %{pkgver}-%{release}\ %endif # ghc_devel_description -%ghc_devel_description\ +%ghc_devel_description()\ %define pkgname %{?1}%{!?1:%{pkg_name}}\ %define basepkg ghc-%{pkgname}\ %description -n %{basepkg}-devel\ @@ -211,7 +211,7 @@ Provides: %{basepkg}-prof = %{pkgver}-%{release}\ This package contains the development files. # ghc_devel_post_postun -%ghc_devel_post_postun\ +%ghc_devel_post_postun()\ %define pkgname %{?1}%{!?1:%{pkg_name}}\ %define basepkg ghc-%{pkgname}\ %post -n %{basepkg}-devel\ diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 5f31356..64db461 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.93 +Version: 0.94 Release: 1%{?dist} Summary: Macros for building packages for GHC @@ -60,6 +60,10 @@ EOF %changelog +* Thu Jun 7 2012 Jens Petersen - 0.94-1 +- allow ghc_description, ghc_devel_description, ghc_devel_post_postun + to take args + * Thu Jun 7 2012 Jens Petersen - 0.93-1 - fix doc handling of subpackages for ghc_without_shared