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

drop -h option from extra macros and make -m work again

Browse Source
This commit is contained in:
Jens Petersen 2013-06-05 12:43:26 +09:00
parent 6d8c8e6f0c
commit 9761c94426
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ghc-rpm-macros.ghc-extra
View File

@ -5,8 +5,8 @@
%{?base_doc_files:%doc %base_doc_files}\ %{?base_doc_files:%doc %base_doc_files}\
%{nil} %{nil}
# ghc_lib_package [-c cdepslist] [-h pkgdepslist] # ghc_lib_package [-c cdepslist]
%ghc_lib_package(c:h:)\ %ghc_lib_package(c:)\
%define pkgname %{?1}%{!?1:%{pkg_name}}\ %define pkgname %{?1}%{!?1:%{pkg_name}}\
%define basepkg ghc-%{pkgname}\ %define basepkg ghc-%{pkgname}\
%ghc_shared_files\ %ghc_shared_files\
@ -32,8 +32,8 @@ Summary: %{?common_summary}%{!?common_summary:Haskell %{pkgname} library}
%description -n %{basepkg}\ %description -n %{basepkg}\
%{?common_description}%{!?common_description:Haskell %{pkgname} library.} %{?common_description}%{!?common_description:Haskell %{pkgname} library.}
# ghc_lib_subpackage [-c cdepslist] [-h pkgdepslist] [-l licensetag] [-x] [name] [version] # ghc_lib_subpackage [-c cdepslist] [-l licensetag] [-x] [name] [version]
%ghc_lib_subpackage(c:h:l:x)\ %ghc_lib_subpackage(c:l:x)\
%define pkgname %{?1}%{!?1:%{pkg_name}}\ %define pkgname %{?1}%{!?1:%{pkg_name}}\
%define pkgver %{?2}%{!?2:%{version}}\ %define pkgver %{?2}%{!?2:%{version}}\
%define pkgnamever %{pkgname}-%{pkgver}\ %define pkgnamever %{pkgname}-%{pkgver}\
@ -68,11 +68,13 @@ Summary: %{?common_summary}%{!?common_summary:Haskell %{pkgname} library}
%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 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
# ghc_devel_package [-c cdepslist] [-h pkgdepslist] [-l licensetag] [-m] [name] [version] # ghc_devel_package [-c cdepslist] [-l licensetag] [-m] [name] [version]
# -m : meta-package # -m : meta-package
%ghc_devel_package(c:h:l:m)\ %ghc_devel_package(c: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}\
@ -81,7 +83,6 @@ Summary: %{?common_summary}%{!?common_summary:Haskell %{pkgname} library}
%{?1:Version: %{pkgver}}\ %{?1:Version: %{pkgver}}\
%{-l:License: %{-l*}}\ %{-l:License: %{-l*}}\
%{?ghc_devel_requires}\ %{?ghc_devel_requires}\
%{-h:Requires: %{-h*}}\
%{?ghc_pkg_c_deps:Requires: %{ghc_pkg_c_deps}}\ %{?ghc_pkg_c_deps:Requires: %{ghc_pkg_c_deps}}\
%{-c:Requires: %{-c*}}\ %{-c:Requires: %{-c*}}\
%{?ghc_pkg_obsoletes:Obsoletes: %{ghc_pkg_obsoletes}}\ %{?ghc_pkg_obsoletes:Obsoletes: %{ghc_pkg_obsoletes}}\
@ -112,7 +113,7 @@ This package contains the development files.
%postun -n %{basepkg}-devel\ %postun -n %{basepkg}-devel\
%ghc_pkg_recache %ghc_pkg_recache
# ghc_package_devel [-c cdepslist] [-h pkgdepslist] [-l licensetag] [name] [version] # ghc_package_devel [-c cdepslist] [-l licensetag] [name] [version]
%ghc_package_devel(c:h:l:)\ %ghc_package_devel(c:h:l:)\
%define pkgname %{?1}%{!?1:%{pkg_name}}\ %define pkgname %{?1}%{!?1:%{pkg_name}}\
%define basepkg ghc-%{pkgname}\ %define basepkg ghc-%{pkgname}\

10
ghc-rpm-macros.spec
View File

@ -6,12 +6,12 @@
#%%global without_hscolour 1 #%%global without_hscolour 1
Name: ghc-rpm-macros Name: ghc-rpm-macros
Version: 0.99 Version: 0.99.2
Release: 1%{?dist} Release: 1%{?dist}
Summary: RPM macros for building packages for GHC Summary: RPM macros for building packages for GHC
License: GPLv3 License: GPLv3
URL: https://fedoraproject.org/wiki/Haskell_SIG URL: https://fedoraproject.org/wiki/Packaging:Haskell
# This is a Fedora maintained package, originally made for # This is a Fedora maintained package, originally made for
# the distribution. Hence the source is currently only available # the distribution. Hence the source is currently only available
@ -87,6 +87,12 @@ EOF
%changelog %changelog
* Wed Jun 5 2013 Jens Petersen <petersen@redhat.com> - 0.99.2-1
- drop -h option from extra macros and make -m work again
* Fri May 17 2013 Jens Petersen <petersen@redhat.com> - 0.99.1-1
- drop new ghc_compiler macro since it is not good for koji
* Tue Apr 23 2013 Jens Petersen <petersen@redhat.com> - 0.99-1 * Tue Apr 23 2013 Jens Petersen <petersen@redhat.com> - 0.99-1
- update for simplified revised Haskell Packaging Guidelines - update for simplified revised Haskell Packaging Guidelines
(https://fedorahosted.org/fpc/ticket/194) (https://fedorahosted.org/fpc/ticket/194)