From 226d76f65b9fee949b0d42d49335f89ab7cfdb4a Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Mon, 22 Sep 2014 11:29:18 +0300 Subject: [PATCH] - Gnat macros are now in a package of their own (#1133632) --- macros.gnat-srpm | 4 ---- redhat-rpm-config.spec | 7 +++++-- 2 files changed, 5 insertions(+), 6 deletions(-) delete mode 100644 macros.gnat-srpm diff --git a/macros.gnat-srpm b/macros.gnat-srpm deleted file mode 100644 index fc7c803..0000000 --- a/macros.gnat-srpm +++ /dev/null @@ -1,4 +0,0 @@ -# GNAT_arches lists the architectures where GNAT is available in Fedora. Ada -# packages won't build on other architectures until GNAT is bootstrapped for -# them. -%GNAT_arches %{ix86} x86_64 ia64 ppc ppc64 alpha aarch64 %{arm} diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec index 3a57200..fa65527 100644 --- a/redhat-rpm-config.spec +++ b/redhat-rpm-config.spec @@ -6,7 +6,7 @@ Summary: Red Hat specific rpm configuration files Name: redhat-rpm-config -Version: 25 +Version: 26 Release: 1%{?dist} # No version specified. License: GPL+ @@ -26,7 +26,6 @@ Source51: redhat-hardened-ld # that would otherwise be providing the macros. other language/arch specific # macros should not be defined here but instead in the base packages that can # be pulled in at rpm build time, this is specific for srpm creation. -Source101: macros.gnat-srpm Source102: macros.mono-srpm Source103: macros.nodejs-srpm @@ -65,6 +64,7 @@ BuildArch: noarch Requires: coreutils Requires: perl-srpm-macros Requires: ocaml-srpm-macros +Requires: gnat-srpm-macros Requires: ghc-srpm-macros Requires: rpm >= 4.11.0 Requires: dwz >= 0.4 @@ -135,6 +135,9 @@ install -p -m 755 -t %{buildroot}%{_rpmconfigdir} kmod.prov %{_rpmconfigdir}/macros.d/macros.kmp %changelog +* Mon Sep 22 2014 Panu Matilainen - 26-1 +- Gnat macros are now in a package of their own (#1133632) + * Fri Sep 19 2014 Dan Horák - 25-1 - there is still no properly packaged Mono for ppc64le