From d5f2dbf98b43d7286f518cf6f63aa9d4b4e5a898 Mon Sep 17 00:00:00 2001
From: Olivier Thauvin <nanardon@mandriva.org>
Date: Fri, 13 May 2005 08:21:03 +0000
Subject: - do not reload rpm configuration as it pollute macros parsing - +k6
 on ix86

---
 macros.in | 2 ++
 rpmrc.in  | 3 ---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/macros.in b/macros.in
index e307a07..24bbc65 100644
--- a/macros.in
+++ b/macros.in
@@ -60,6 +60,8 @@
 %%install\
 %{nil}
 
+%ix86 i386 i486 i586 i686 pentium3 pentium4 athlon k6
+
 #==============================================================================
 # ---- Optional rpmrc macros.
 #	Macros that are initialized as a side effect of rpmrc and/or spec
diff --git a/rpmrc.in b/rpmrc.in
index 22d22b9..0474c4e 100644
--- a/rpmrc.in
+++ b/rpmrc.in
@@ -2,9 +2,6 @@
 #
 # @RPMVENDORDIR@/rpmrc
 
-# Getting default rpm configuration
-include: @RPMLIBDIR@/rpmrc
-
 #############################################################
 # Values for RPM_OPT_FLAGS for various platforms
 
-- 
cgit v1.2.1