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

add a meta-package option to ghc_devel_package and use in ghc_devel_requires

Browse Source
This commit is contained in:
Jens Petersen 2012-06-08 11:53:40 +09:00
parent dae8fa2606
commit c013051271
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ghc-rpm-macros.ghc
View File

@ -102,7 +102,7 @@ install --mode=0644 %{pkgnamever}.conf %{buildroot}%{ghclibdir}/package.conf.d\
%ghc_devel_requires Requires: ghc-compiler = %{ghc_version}\ %ghc_devel_requires Requires: ghc-compiler = %{ghc_version}\
Requires(post): ghc-compiler = %{ghc_version}\ Requires(post): ghc-compiler = %{ghc_version}\
Requires(postun): 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}\ Requires: ghc-%{?pkg_name}%{!?pkg_name:%{pkgname}} = %{?pkgver}%{!?pkgver:%{version}}-%{release}\
%endif %endif
@ -179,8 +179,9 @@ This package provides the shared library.\
%ghc_devel_files\ %ghc_devel_files\
%{nil} %{nil}
# ghc_devel_package [-c cdepslist] [-h pkgdepslist] [-l licensetag] [name] [version] # ghc_devel_package [-c cdepslist] [-h pkgdepslist] [-l licensetag] [-m] [name] [version]
%ghc_devel_package(c:h:l:)\ # -m : meta-package
%ghc_devel_package(c:h:l:m)\
%define pkgname %{?1}%{!?1:%{pkg_name}}\ %define pkgname %{?1}%{!?1:%{pkg_name}}\
%define pkgver %{?2}%{!?2:%{version}}\ %define pkgver %{?2}%{!?2:%{version}}\
%define basepkg ghc-%{pkgname}\ %define basepkg ghc-%{pkgname}\

5
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.95 Version: 0.95.1
Release: 1%{?dist} Release: 1%{?dist}
Summary: Macros for building packages for GHC Summary: Macros for building packages for GHC
@ -60,6 +60,9 @@ EOF
%changelog %changelog
* Fri Jun 8 2012 Jens Petersen <petersen@redhat.com> - 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 <petersen@redhat.com> - 0.95-1 * Thu Jun 7 2012 Jens Petersen <petersen@redhat.com> - 0.95-1
- let ghc_bin_install take an arg to disable implicit stripping for subpackages - let ghc_bin_install take an arg to disable implicit stripping for subpackages