From e1c85e4a295339e31ea9f1ad2b1a74735cc4df91 Mon Sep 17 00:00:00 2001
From: Olivier Thauvin <nanardon@mandriva.org>
Date: Mon, 9 May 2005 10:16:19 +0000
Subject: - handle pentium computer

---
 configure.ac            | 6 +++---
 make_macrosfiles.sh.in  | 2 +-
 rpm-mandriva-setup.spec | 2 +-
 rpmrc.in                | 3 +++
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index c5119af..1342c4c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
 # $Id$
 
 AC_PREREQ(2.59)
-AC_INIT(rpm-mandriva-setup, 0.4, nanardon@mandriva.org)
+AC_INIT(rpm-mandriva-setup, 0.5, nanardon@mandriva.org)
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE(1.9)
 AC_CONFIG_SRCDIR
@@ -17,10 +17,10 @@ AC_CONFIG_FILES([
 
 case "${target_cpu}" in
     *86|athlon|k6) 
-    RPMALLARCH="i386 i486 i586 i686 k6 athlon"
+    RPMALLARCH="i386 i486 i586 i686 k6 athlon pentium3 pentium4"
     ;;
     x86_64|amd64)
-    RPMALLARCH="i386 i486 i586 i686 k6 athlon amd64 x86_64"
+    RPMALLARCH="i386 i486 i586 i686 k6 athlon pentium3 pentium4 amd64 x86_64"
     ;;
     ppc|powerpc)
     RPMALLARCH="ppc"
diff --git a/make_macrosfiles.sh.in b/make_macrosfiles.sh.in
index 93fd0be..f7c06bc 100644
--- a/make_macrosfiles.sh.in
+++ b/make_macrosfiles.sh.in
@@ -11,7 +11,7 @@ OPTFLAGS=`perl -ane "m/^optflags:\s*${ARCH}\s*(.*)/ and print \\$1" < rpmrc`
 MULTILIBNO=
 
 case $ARCH in
-    i*86|k6|athlon)
+    i*86|k6|athlon|pentium*)
     MULTILIBNO=1
     CANONARCH=i386
     ;;
diff --git a/rpm-mandriva-setup.spec b/rpm-mandriva-setup.spec
index 9ef4234..c1e721d 100644
--- a/rpm-mandriva-setup.spec
+++ b/rpm-mandriva-setup.spec
@@ -1,5 +1,5 @@
 %define name rpm-mandriva-setup
-%define version 0.4
+%define version 0.5
 %define release %mkrel 1
 
 Summary: The Mandriva rpm configuration and scripts
diff --git a/rpmrc.in b/rpmrc.in
index 8791208..22d22b9 100644
--- a/rpmrc.in
+++ b/rpmrc.in
@@ -77,11 +77,14 @@ arch_canon:	x86_64:	x86_64	19
 # For a given uname().machine, the default build arch
 
 buildarchtranslate: athlon: i586
+buildarchtranslate: pentium4: i586
+buildarchtranslate: pentium3: i586
 buildarchtranslate: i686: i586
 buildarchtranslate: k6: i586
 buildarchtranslate: i586: i586
 buildarchtranslate: i486: i486
 buildarchtranslate: i386: i386
+buildarchtranslate: i386: i386
 
 #############################################################
 # Architecture compatibility
-- 
cgit v1.2.1