add aarch64; and ppc64le hscolour

This commit is contained in:
Jens Petersen 2014-06-06 19:57:00 +09:00
parent 72f890df77
commit 4ef4fab228
2 changed files with 6 additions and 3 deletions

View File

@ -6,7 +6,7 @@
#%%global without_hscolour 1
Name: ghc-rpm-macros
Version: 1.2.12
Version: 1.2.13
Release: 1%{?dist}
Summary: RPM macros for building packages for GHC
@ -29,7 +29,7 @@ Requires: ghc-srpm-macros = %{version}-%{release}
# macros.ghc-srpm moved out from redhat-rpm-config-21
Requires: redhat-rpm-config > 20-1.fc21
%if %{undefined without_hscolour}
%ifarch %{ix86} %{ix86} x86_64 ppc ppc64 alpha sparcv9 armv7hl armv5tel s390 s390x
%ifarch %{ix86} %{ix86} x86_64 ppc ppc64 alpha sparcv9 armv7hl armv5tel s390 s390x ppc64le aarch64
Requires: hscolour
%endif
%endif
@ -110,6 +110,9 @@ EOF
%changelog
* Fri Jun 6 2014 Jens Petersen <petersen@redhat.com> - 1.2.13-1
- add aarch64
* Sun Jun 1 2014 Jens Petersen <petersen@redhat.com> - 1.2.12-1
- add missing ppc64, s390, and s390x to ghc_arches
- add new ppc64le to ghc_arches

View File

@ -3,4 +3,4 @@
# old archs: alpha sparcv9
%ghc_arches_with_ghci %{ix86} x86_64 ppc armv7hl armv5tel
%ghc_arches %{ix86} x86_64 ppc ppc64 ppc64le armv7hl armv5tel s390 s390x
%ghc_arches %{ix86} x86_64 ppc ppc64 ppc64le armv7hl armv5tel aarch64 s390 s390x