- bump rpm macros req to 1.652

- use _host_base_arch as a means to detect crosscompilation

diff --git a/kernel.spec b/kernel.spec
index c837e019a9a015b14131d49809511aa1dd46c9ae..9e3de1be26e337cf9468d4c7b1c21e57bf424096 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -282,7 +282,7 @@ BuildRequires:      hostname
 BuildRequires: virtual(module-tools)
 BuildRequires: perl-base
 BuildRequires: rpm-build >= 4.5-24
-BuildRequires: rpmbuild(macros) >= 1.217
+BuildRequires: rpmbuild(macros) >= 1.652
 Requires(post):        coreutils
 Requires(post):        geninitrd >= 10000-3
 Requires(post):        virtual(module-tools)
@@ -372,21 +372,21 @@ BuildRoot:        %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _kernelsrcdir   /usr/src/linux%{_alt_kernel}-%{version}
 
-%if "%{_target_base_arch}" != "%{_arch}"
+%if "%{_target_base_arch}" != "%{_host_base_arch}"
        %define CrossOpts ARCH=%{_target_base_arch} CROSS_COMPILE=%{_target_cpu}-pld-linux-
        %define DepMod /bin/true
 
-       %if "%{_arch}" == "sparc" && "%{_target_base_arch}" == "sparc64"
+       %if "%{_host_base_arch}" == "sparc" && "%{_target_base_arch}" == "sparc64"
        %define CrossOpts ARCH=%{_target_base_arch} CC="%{__cc}"
        %define DepMod /sbin/depmod
        %endif
 
-       %if "%{_arch}" == "sparc64" && "%{_target_base_arch}" == "sparc"
+       %if "%{_host_base_arch}" == "sparc64" && "%{_target_base_arch}" == "sparc"
        %define CrossOpts ARCH=%{_target_base_arch} CC="%{__cc}"
        %define DepMod /sbin/depmod
        %endif
 
-       %if "%{_arch}" == "x86_64" && "%{_target_base_arch}" == "i386"
+       %if "%{_host_base_arch}" == "x86_64" && "%{_target_base_arch}" == "i386"
        %define CrossOpts ARCH=%{_target_base_arch} CC="%{__cc}"
        %define DepMod /sbin/depmod
        %endif
@@ -564,7 +564,7 @@ Summary(de.UTF-8):  Development Dateien die beim Kernel Modul kompilationen gebra
 Summary(pl.UTF-8):     Pliki służące do budowania modułów jądra
 Group:         Development/Building
 Requires:      %{name}-headers = %{epoch}:%{version}-%{release}
-Conflicts:     rpmbuild(macros) < 1.642
+Conflicts:     rpmbuild(macros) < 1.652
 AutoReqProv:   no
 
 %description module-build
@@ -1048,7 +1048,7 @@ cp -a %{objdir}/System.map $RPM_BUILD_ROOT/boot/System.map-%{kernel_release}
 # ghosted initrd
 touch $RPM_BUILD_ROOT%{initrd_dir}/initrd-%{kernel_release}.gz
 
-%if "%{_target_base_arch}" != "%{_arch}"
+%if "%{_target_base_arch}" != "%{_host_base_arch}"
 touch $RPM_BUILD_ROOT/lib/modules/%{kernel_release}/modules.dep
 %endif