Merge remote-tracking branch 'up/master' into master-riscv64

Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>

ghc-srpm-macros.spec

@@ -5,7 +5,7 @@
 
 Name:           ghc-srpm-macros
 Version:        1.5.0
-Release:        2%{?dist}
+Release:        2.0.riscv64%{?dist}
 Summary:        RPM macros for building Haskell source packages
 
 License:        GPLv2+
@@ -35,6 +35,9 @@ install -p -D -m 0644 %{SOURCE0} %{buildroot}/%{macros_dir}/macros.ghc-srpm
 
 
 %changelog
+* Sun Apr 19 2020 David Abdurachmanov <david.abdurachmanov@gmail.com> - 1.5.0-2.0.riscv64
+- Add RISC-V (riscv64)
+
 * Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 

macros.ghc-srpm

@@ -2,11 +2,11 @@
 
 # from ghc-7.8 ghci is supported on all arch's
 # former archs: armv5tel ppc sparcv9
-%ghc_arches_with_ghci %{ix86} x86_64 armv7hl ppc64 ppc64le aarch64 s390 s390x %{mips}
+%ghc_arches_with_ghci %{ix86} x86_64 armv7hl ppc64 ppc64le aarch64 s390 s390x %{mips} riscv64
 
 # ghc_arches is not used in current packages but still here for back compat
 # former archs: alpha ppc sparcv9 armv5tel
-%ghc_arches %{ix86} x86_64 armv7hl ppc64 ppc64le aarch64 s390 s390x
+%ghc_arches %{ix86} x86_64 armv7hl ppc64 ppc64le aarch64 s390 s390x riscv64
 
 # control whether to BR devel or prof library packages
 # (prof subpackages were introduced in F31)