Synthesized commit during git-svn import combining previous Mandriva history with Mageia.1.0.13

This commit consitsts of the following subversion commits:

------------------------------------------------------------------------
r399 | dmorgan | 2011-02-03 18:09:01 +0000 (Thu, 03 Feb 2011) | 1 line

Import cleaned multiarch-utils*
------------------------------------------------------------------------

In addition to the above commits, the following cleaning work has been recorded:

- License is GPL according to the relevant rpm spec written by Mandriva (no explicit
  COPYING or LICENSE files)
- '# Project: Mandriva Linux' in several files, removed

1 files changed, 3 insertions, 6 deletions

diff --git a/macros.multiarch b/macros.multiarch
index 8cad465..2b43acf 100644
--- a/macros.multiarch
+++ b/macros.multiarch
@@ -7,16 +7,13 @@
 %multiarch_distro %MULTIARCH_DISTRO%
 
 %multiarch_binaries() \
-%if %{mdkversion} >= %{multiarch_distro} \
 %{_prefix}/lib/rpm/mkmultiarch binaries %* \
-%endif
+%{nil}
 
 %multiarch_includes() \
-%if %{mdkversion} >= %{multiarch_distro} \
 %{_prefix}/lib/rpm/mkmultiarch includes %* \
-%endif
+%{nil}
 
 %multiarch() \
-%if %{mdkversion} >= %{multiarch_distro} \
 %* \
-%endif
+%{nil}