rpms/ghc-rpm-macros
6
0
Fork 0
Code Issues Pull Requests Releases Activity

ghc_description, ghc_devel_description, ghc_devel_post_postun can take args

Browse Source
This commit is contained in:
Jens Petersen 2012-06-07 19:32:38 +09:00
parent bbc5f8f364
commit fa247e69af
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ghc-rpm-macros.ghc
View File

@ -135,7 +135,7 @@ Group: System Environment/Libraries\
%{?ghc_pkg_obsoletes:Obsoletes: %(echo "%{ghc_pkg_obsoletes}" | sed -e "s/\\(ghc-[^, ]*\\)-devel/\\1/g")} %{?ghc_pkg_obsoletes:Obsoletes: %(echo "%{ghc_pkg_obsoletes}" | sed -e "s/\\(ghc-[^, ]*\\)-devel/\\1/g")}
# ghc_description [name] [version] # ghc_description [name] [version]
%ghc_description\ %ghc_description()\
%define pkgname %{?1}%{!?1:%{pkg_name}}\ %define pkgname %{?1}%{!?1:%{pkg_name}}\
%define basepkg ghc-%{pkgname}\ %define basepkg ghc-%{pkgname}\
%description -n %{basepkg}\ %description -n %{basepkg}\
@ -202,7 +202,7 @@ Provides: %{basepkg}-prof = %{pkgver}-%{release}\
%endif %endif
# ghc_devel_description # ghc_devel_description
%ghc_devel_description\ %ghc_devel_description()\
%define pkgname %{?1}%{!?1:%{pkg_name}}\ %define pkgname %{?1}%{!?1:%{pkg_name}}\
%define basepkg ghc-%{pkgname}\ %define basepkg ghc-%{pkgname}\
%description -n %{basepkg}-devel\ %description -n %{basepkg}-devel\
@ -211,7 +211,7 @@ Provides: %{basepkg}-prof = %{pkgver}-%{release}\
This package contains the development files. This package contains the development files.
# ghc_devel_post_postun # ghc_devel_post_postun
%ghc_devel_post_postun\ %ghc_devel_post_postun()\
%define pkgname %{?1}%{!?1:%{pkg_name}}\ %define pkgname %{?1}%{!?1:%{pkg_name}}\
%define basepkg ghc-%{pkgname}\ %define basepkg ghc-%{pkgname}\
%post -n %{basepkg}-devel\ %post -n %{basepkg}-devel\

6
ghc-rpm-macros.spec
View File

@ -3,7 +3,7 @@
%global macros_file %{_sysconfdir}/rpm/macros.ghc %global macros_file %{_sysconfdir}/rpm/macros.ghc
Name: ghc-rpm-macros Name: ghc-rpm-macros
Version: 0.93 Version: 0.94
Release: 1%{?dist} Release: 1%{?dist}
Summary: Macros for building packages for GHC Summary: Macros for building packages for GHC
@ -60,6 +60,10 @@ EOF
%changelog %changelog
* Thu Jun 7 2012 Jens Petersen <petersen@redhat.com> - 0.94-1
- allow ghc_description, ghc_devel_description, ghc_devel_post_postun
to take args
* Thu Jun 7 2012 Jens Petersen <petersen@redhat.com> - 0.93-1 * Thu Jun 7 2012 Jens Petersen <petersen@redhat.com> - 0.93-1
- fix doc handling of subpackages for ghc_without_shared - fix doc handling of subpackages for ghc_without_shared