- 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 cdc8fe3dcb570067f72a72acd3a70f48775ae46d..bc9de94f63196d9d49e721ffeda375e7d97e7c6b 100644 (file)
--- 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 290c64e04d52b7ae8b767dee4a400c8ce2e5a190..6dbec27ec59469e0acde843e3e7d2bafff8ca284 100644 (file)
--- 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 98b91e586618be26ec0cccc48d76fa8f89ac44c4..096067c400e21972d34e0e58542550191190db96 100644 (file)
--- 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
 #