aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Thauvin <nanardon@mandriva.org>2005-05-13 08:21:03 +0000
committerOlivier Thauvin <nanardon@mandriva.org>2005-05-13 08:21:03 +0000
commitd5f2dbf98b43d7286f518cf6f63aa9d4b4e5a898 (patch)
treec8153b7c42c99def1e4c88befdedf9c59d21a672
parent0862038e7f55a37a7438f00e90f8d8fd0f258fcc (diff)
downloadrpm-setup-d5f2dbf98b43d7286f518cf6f63aa9d4b4e5a898.tar
rpm-setup-d5f2dbf98b43d7286f518cf6f63aa9d4b4e5a898.tar.gz
rpm-setup-d5f2dbf98b43d7286f518cf6f63aa9d4b4e5a898.tar.bz2
rpm-setup-d5f2dbf98b43d7286f518cf6f63aa9d4b4e5a898.tar.xz
rpm-setup-d5f2dbf98b43d7286f518cf6f63aa9d4b4e5a898.zip
- do not reload rpm configuration as it pollute macros parsing
- +k6 on ix86
-rw-r--r--macros.in2
-rw-r--r--rpmrc.in3
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