From: Jan Rękorajski <baggins@pld-linux.org>
Date: Sat, 3 Jan 2015 16:35:37 +0000 (+0100)
Subject: - moved _{host,target}_base_arch macros where they belong (kernel specific)
X-Git-Tag: auto/th/rpm-build-macros-1.705-1
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=d9c557d8ab30eca9467b210845a04bb6fee83671;p=packages%2Frpm-build-macros.git

- moved _{host,target}_base_arch macros where they belong (kernel specific)
- translate x32 to x86_64 for kernel purposes
---

diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index cdc8fe3..bc9de94 100644
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -1,4 +1,4 @@
-%define		rpm_macros_rev	1.704
+%define		rpm_macros_rev	1.705
 %define		find_lang_rev	1.36
 Summary:	PLD Linux RPM build macros
 Summary(pl.UTF-8):	Makra do budowania pakietów RPM dla Linuksa PLD
diff --git a/rpm.macros b/rpm.macros
index 290c64e..6dbec27 100644
--- a/rpm.macros
+++ b/rpm.macros
@@ -1147,9 +1147,6 @@ fi; \
 %xmms_effect_plugindir		%{expand:%%global xmms_effect_plugindir %(xmms-config --effect-plugin-dir 2>/dev/null || echo ERROR)}%xmms_effect_plugindir
 %xmms_general_plugindir		%{expand:%%global xmms_general_plugindir %(xmms-config --general-plugin-dir 2>/dev/null || echo ERROR)}%xmms_general_plugindir
 
-%_host_base_arch	%{expand:%%global _host_base_arch %(echo %{_host_cpu} | sed 's/i.86/i386/;s/athlon/i386/;s/pentium./i386/;s/amd64/x86_64/;s/ia32e/x86_64/;s/sparcv./sparc/;s/arm.*/arm/')}%_host_base_arch
-%_target_base_arch	%{expand:%%global _target_base_arch %(echo %{_target_cpu} | sed 's/i.86/i386/;s/athlon/i386/;s/pentium./i386/;s/amd64/x86_64/;s/ia32e/x86_64/;s/sparcv./sparc/;s/arm.*/arm/')}%_target_base_arch
-
 # user/group checking macros
 #
 # Usage:
diff --git a/rpm.macros.kernel b/rpm.macros.kernel
index 98b91e5..096067c 100644
--- a/rpm.macros.kernel
+++ b/rpm.macros.kernel
@@ -90,6 +90,9 @@ done)
 # package version to be used in @release field
 %_kernel_ver_str	%(echo %{__kernel_qf %{V}-%{R}} | tr '-' '_')
 
+%_host_base_arch	%{expand:%%global _host_base_arch %(echo %{_host_cpu} | sed 's/i.86/i386/;s/athlon/i386/;s/pentium./i386/;s/amd64/x86_64/;s/ia32e/x86_64/;s/x32/x86_64/;s/sparcv./sparc/;s/arm.*/arm/')}%_host_base_arch
+%_target_base_arch	%{expand:%%global _target_base_arch %(echo %{_target_cpu} | sed 's/i.86/i386/;s/athlon/i386/;s/pentium./i386/;s/amd64/x86_64/;s/ia32e/x86_64/;s/x32/x86_64/;s/sparcv./sparc/;s/arm.*/arm/')}%_target_base_arch
+
 #-----------------------------------------------------------------
 # Find and gzip all kernel modules
 #