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

make ghc_lib_subpackage backward compatible with older 2 arg form

This commit is contained in:
Jens Petersen 2016-10-26 17:49:50 +09:00
parent 9c211a6a35
commit ebdd0063dd
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ghc-rpm-macros.spec
View File

@ -10,8 +10,8 @@
#%%global without_hscolour 1 #%%global without_hscolour 1
Name: ghc-rpm-macros Name: ghc-rpm-macros
Version: 1.6.9 Version: 1.6.10
Release: 8%{?dist} Release: 1%{?dist}
Summary: RPM macros for building Haskell packages for GHC Summary: RPM macros for building Haskell packages for GHC
License: GPLv3+ License: GPLv3+
@ -146,6 +146,9 @@ EOF
%changelog %changelog
* Wed Oct 26 2016 Jens Petersen <petersen@redhat.com> - 1.6.10-1
- make ghc_lib_subpackage backward compatible with older 2 args form
* Mon Oct 17 2016 Jens Petersen <petersen@redhat.com> - 1.6.9-8 * Mon Oct 17 2016 Jens Petersen <petersen@redhat.com> - 1.6.9-8
- disable dynlinking on armv7hl too - disable dynlinking on armv7hl too

9
macros.ghc-extra
View File

@ -1,16 +1,17 @@
# RPM Macros for packaging Haskell packages with multiple libs -*-rpm-spec-*- # RPM Macros for packaging Haskell packages with multiple libs -*-rpm-spec-*-
# ghc_lib_subpackage [-c cdepslist] [-l licensetag] [-x] [name-version] # ghc_lib_subpackage [-c cdepslist] [-l licensetag] [-x] [name-version]
# for backward compat also support: ghc_lib_subpackage name version
%ghc_lib_subpackage(c:l:x)\ %ghc_lib_subpackage(c:l:x)\
%define pkgname %{lua:\ %define pkgname %{?2:%{1}}%{!?2:%{lua:\
local pv = rpm.expand("%1")\ local pv = rpm.expand("%1")\
local _, _, name = string.find(pv, "^([%a-]+)-")\ local _, _, name = string.find(pv, "^([%a-]+)-")\
print(name)\ print(name)\
}\ }}\
%define pkgver %{lua:\ %define pkgver %{?2}%{!?2:%{lua:\
local pv = rpm.expand("%1")\ local pv = rpm.expand("%1")\
print(string.sub(pv, string.find(pv, "[%d.]+$")))\ print(string.sub(pv, string.find(pv, "[%d.]+$")))\
}\ }}\
%{!-x:%{?1:%global ghc_packages_list %{?ghc_packages_list} %{pkgname}-%{pkgver}}}\ %{!-x:%{?1:%global ghc_packages_list %{?ghc_packages_list} %{pkgname}-%{pkgver}}}\
%define ghc_prefix %{?ghc_name}%{!?ghc_name:ghc}\ %define ghc_prefix %{?ghc_name}%{!?ghc_name:ghc}\
%define basepkg %{ghc_prefix}-%{pkgname}\ %define basepkg %{ghc_prefix}-%{pkgname}\