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

Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>
This commit is contained in:
David Abdurachmanov 2020-04-19 10:28:29 +03:00
commit 38ad4d9d79
Signed by: davidlt
GPG Key ID: 8B7F1DA0E2C9FDBB
2 changed files with 16 additions and 3 deletions

View File

@ -4,8 +4,8 @@
%global macros_dir %{_rpmconfigdir}/macros.d
Name: ghc-srpm-macros
Version: 1.4.2
Release: 9.0.riscv64%{?dist}
Version: 1.5.0
Release: 2.0.riscv64%{?dist}
Summary: RPM macros for building Haskell source packages
License: GPLv2+
@ -35,9 +35,18 @@ install -p -D -m 0644 %{SOURCE0} %{buildroot}/%{macros_dir}/macros.ghc-srpm
%changelog
* Tue Feb 19 2019 David Abdurachmanov <david.abdurachmanov@gmail.com> - 1.4.2-9.0.riscv64
* 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
* Tue Oct 1 2019 Jens Petersen <petersen@redhat.com> - 1.5.0-1
- define ghc_devel_prof to handle prof/devel BRs across releases
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.2-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.2-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

View File

@ -7,3 +7,7 @@
# 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 riscv64
# control whether to BR devel or prof library packages
# (prof subpackages were introduced in F31)
%ghc_devel_prof prof