From ba313d2b777f9bc6e0a4d601e599f40906a85734 Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Feb 08 2016 13:18:33 +0000
Subject: Convert %define to %global


---

diff --git a/cross-binutils.spec b/cross-binutils.spec
index cfb8ed9..9cd12d5 100644
--- a/cross-binutils.spec
+++ b/cross-binutils.spec
@@ -1,54 +1,54 @@
 
-%define cross cross
-%define rpmprefix %{nil}
-
-%define build_all		1
-%define build_aarch64		%{build_all}
-%define build_alpha		%{build_all}
-%define build_arm		%{build_all}
-%define build_avr32		%{build_all}
-%define build_blackfin		%{build_all}
-%define build_c6x		%{build_all}
-%define build_cris		%{build_all}
-%define build_frv		%{build_all}
-%define build_h8300		%{build_all}
-%define build_hppa		%{build_all}
-%define build_hppa64		%{build_all}
-%define build_ia64		%{build_all}
-%define build_m32r		%{build_all}
-%define build_m68k		%{build_all}
-%define build_metag		%{build_all}
-%define build_microblaze	%{build_all}
-%define build_mips64		%{build_all}
-%define build_mn10300		%{build_all}
-%define build_nios2		%{build_all}
-%define build_openrisc		%{build_all}
-%define build_powerpc64		%{build_all}
-%define build_powerpc64le	%{build_all}
-%define build_s390x		%{build_all}
-%define build_score		%{build_all}
-%define build_sh		%{build_all}
-%define build_sh64		%{build_all}
-%define build_sparc64		%{build_all}
-%define build_tile		%{build_all}
-%define build_x86_64		%{build_all}
-%define build_xtensa		%{build_all}
+%global cross cross
+%global rpmprefix %{nil}
+
+%global build_all		1
+%global build_aarch64		%{build_all}
+%global build_alpha		%{build_all}
+%global build_arm		%{build_all}
+%global build_avr32		%{build_all}
+%global build_blackfin		%{build_all}
+%global build_c6x		%{build_all}
+%global build_cris		%{build_all}
+%global build_frv		%{build_all}
+%global build_h8300		%{build_all}
+%global build_hppa		%{build_all}
+%global build_hppa64		%{build_all}
+%global build_ia64		%{build_all}
+%global build_m32r		%{build_all}
+%global build_m68k		%{build_all}
+%global build_metag		%{build_all}
+%global build_microblaze	%{build_all}
+%global build_mips64		%{build_all}
+%global build_mn10300		%{build_all}
+%global build_nios2		%{build_all}
+%global build_openrisc		%{build_all}
+%global build_powerpc64		%{build_all}
+%global build_powerpc64le	%{build_all}
+%global build_s390x		%{build_all}
+%global build_score		%{build_all}
+%global build_sh		%{build_all}
+%global build_sh64		%{build_all}
+%global build_sparc64		%{build_all}
+%global build_tile		%{build_all}
+%global build_x86_64		%{build_all}
+%global build_xtensa		%{build_all}
 
 # 32-bit packages we don't build as we can use the 64-bit package instead
-%define build_i386		0
-%define build_mips		0
-%define build_powerpc		0
-%define build_s390		0
-%define build_sparc		0
-%define build_sh4		0
+%global build_i386		0
+%global build_mips		0
+%global build_powerpc		0
+%global build_s390		0
+%global build_sparc		0
+%global build_sh4		0
 
 # not available in binutils-2.24
-%define build_hexagon		0
-%define build_unicore32		0
+%global build_hexagon		0
+%global build_unicore32		0
 
 # BZ 1124342: Enable deterministic archives by default.
 # BZ 1195883: But do not do this by default.
-%define enable_deterministic_archives 0
+%global enable_deterministic_archives 0
 
 Summary: A GNU collection of cross-compilation binary utilities
 Name: %{cross}-binutils
@@ -131,7 +131,7 @@ BuildArch: noarch
 Documentation, manual pages and translation files for cross-build binary image
 generation, manipulation and query tools.
 
-%define do_package() \
+%global do_package() \
 %if %2 \
 %package -n %{rpmprefix}binutils-%1 \
 Summary: Cross-build binary utilities for %1 \
@@ -141,7 +141,7 @@ Requires: %{cross}-binutils-common == %{version}-%{release} \
 Cross-build binary image generation, manipulation and query tools. \
 %endif
 
-%define do_symlink() \
+%global do_symlink() \
 %if %2 \
 %package -n %{rpmprefix}binutils-%1 \
 Summary: Cross-build binary utilities for %1 \
@@ -194,7 +194,7 @@ Cross-build binary image generation, manipulation and query tools. \
 %do_package xtensa-linux-gnu	%{build_xtensa}
 
 # Where the binaries aimed at gcc will live (ie. /usr/<target>/bin/)
-%define auxbin_prefix %{_exec_prefix}
+%global auxbin_prefix %{_exec_prefix}
 
 ###############################################################################
 #
@@ -203,7 +203,7 @@ Cross-build binary image generation, manipulation and query tools. \
 ###############################################################################
 %prep
 
-%define srcdir binutils-%{version}
+%global srcdir binutils-%{version}
 %setup -q -n %{srcdir} -c
 cd %{srcdir}
 #%patch00 -p1 -b .latest-git~
@@ -641,7 +641,7 @@ rm -rf %{buildroot}
 %doc %{srcdir}/COPYING*
 %{_mandir}/man1/%{cross}-*
 
-%define do_files() \
+%global do_files() \
 %if %2 \
 %files -n %{rpmprefix}binutils-%1 -f files.%1 \
 %endif