Merge branch 'master' of git://git.pld-linux.org/packages/rpm-build-macros

diff --combined rpm.macros
index 929a3bd1732cc2132f22596396d55d39635481a4,078ee5a0d13187254a630a8e6a3a78c7329bb759..88ab604c5cf1bbc275cbe7e581587019112fccfe
--- 1/rpm.macros
--- 2/rpm.macros
+++ b/rpm.macros
@@@ -449,6 -449,12 +449,12 @@@ CXXFLAGS="%{rpmcxxflags}" 
  # Requires: name >= version (version based on querying package %2)
  %requires_ge_to(r)    %{!?2:ERROR}%{?3:ERROR}%{?2:%{!?3:%(if ! LC_ALL=C rpm -q --qf 'Requires: %1 >= %|E?{%{E}:}|%{V}%{?-r:-%{R}}\\n' %2 | grep '^Requires:'; then echo "BuildRequires: %2"; fi)}}
  
+ # \helper for renaming packages
+ # %rename old-package
+ %rename() \
+ Obsoletes: %{1} < %{?epoch:%{epoch}:}%{?version:%{version}}%{?release:-%{release}} \
+ Provides: %{1} = %{?epoch:%{epoch}:}%{?version:%{version}}%{?release:-%{release}} 
+ 
  %apache_modules_api %{expand:%%global apache_modules_api %(awk '/#define MODULE_MAGIC_NUMBER_MAJOR/ {print $3}' /usr/include/apache/ap_mmn.h 2>/dev/null || echo ERROR)}%apache_modules_api
  
  # kernel version-release handling
@@@ -1091,7 -1097,6 +1097,7 @@@ 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
@@@ -1636,8 -1641,8 +1642,8 @@@ done 
  %{!?-m:%{error:%{0}: Required module name/list missing} exit 1}               \
                                                                                                                                        \
  %define Opts                                                                                                          \\\\\\\
 -%if "%{_target_base_arch}" != "%{_arch}"                                                      \\\
 -      %if "%{_arch}" == "x86_64" && "%{_target_base_arch}" == "i386"  \\\
 +%if "%{_target_base_arch}" != "%{_host_base_arch}"                                    \\\
 +      %if "%{_host_base_arch}" == "x86_64" && "%{_target_base_arch}" == "i386" \\\
        CC="%{kgcc}" ARCH=%{_target_base_arch}                                                  \\\
        %else                                                                                                                   \\\
        ARCH=%{_target_base_arch} CROSS_COMPILE=%{_target_cpu}-pld-linux- \\\