From f6271b58792a06a1a8475ffea869c2a4dfd49dbf Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Jul 17 2009 19:50:47 +0000 Subject: Add F12 architecture bits. --- diff --git a/redhat-rpm-config-9.0.3-F-12-Architectures.patch b/redhat-rpm-config-9.0.3-F-12-Architectures.patch new file mode 100644 index 0000000..a388ca6 --- /dev/null +++ b/redhat-rpm-config-9.0.3-F-12-Architectures.patch @@ -0,0 +1,29 @@ +diff -up redhat-rpm-config-9.0.3/rpmrc.foo redhat-rpm-config-9.0.3/rpmrc +--- redhat-rpm-config-9.0.3/rpmrc.foo 2009-07-17 15:47:00.000000000 -0400 ++++ redhat-rpm-config-9.0.3/rpmrc 2009-07-17 15:48:46.000000000 -0400 +@@ -3,7 +3,7 @@ include: /usr/lib/rpm/rpmrc + optflags: i386 %{__global_cflags} -m32 -march=i386 -mtune=generic -fasynchronous-unwind-tables + optflags: i486 %{__global_cflags} -m32 -march=i486 -fasynchronous-unwind-tables + optflags: i586 %{__global_cflags} -m32 -march=i586 -mtune=generic -fasynchronous-unwind-tables +-optflags: i686 %{__global_cflags} -m32 -march=i686 -mtune=generic -fasynchronous-unwind-tables ++optflags: i686 %{__global_cflags} -m32 -march=i686 -mtune=atom -fasynchronous-unwind-tables + optflags: athlon %{__global_cflags} -m32 -march=athlon -fasynchronous-unwind-tables + optflags: ia64 %{__global_cflags} + optflags: x86_64 %{__global_cflags} -m64 -mtune=generic +@@ -64,11 +64,11 @@ optflags: s390x %{__global_cflags} -m64 + + # set build arch to fedora buildarches on hardware capable of running it + # saves having to do rpmbuild --target= +-buildarchtranslate: athlon: i586 +-buildarchtranslate: geode: i586 +-buildarchtranslate: pentium4: i586 +-buildarchtranslate: pentium3: i586 +-buildarchtranslate: i686: i586 ++buildarchtranslate: athlon: i686 ++buildarchtranslate: geode: i686 ++buildarchtranslate: pentium4: i686 ++buildarchtranslate: pentium3: i686 ++buildarchtranslate: i686: i686 + buildarchtranslate: i586: i586 + + buildarchtranslate: sparcv9: sparcv9 diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec index da197c9..2c7ad91 100644 --- a/redhat-rpm-config.spec +++ b/redhat-rpm-config.spec @@ -10,6 +10,7 @@ Patch0: redhat-rpm-config-9.0.3-fix-requires.patch Patch1: limit-smp-16-threads.patch Patch2: redhat-rpm-config-9.0.3-F-11-Architectures.patch Patch3: redhat-rpm-config-9.0.3-F-11-StrongerHashes.patch +Patch4: redhat-rpm-config-9.0.3-F-12-Architectures.patch BuildArch: noarch Requires: mktemp BuildRoot: %{_tmppath}/%{name}-root @@ -23,6 +24,7 @@ Red Hat specific rpm configuration files. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %install make DESTDIR=${RPM_BUILD_ROOT} install @@ -35,6 +37,9 @@ rm -rf ${RPM_BUILD_ROOT} %{_prefix}/lib/rpm/redhat %changelog +* Fri Jul 17 2009 Bill Nottingham 9.0.3-10 +- apply fedora 12 default buildflags + * Wed Jun 03 2009 Adam Jackson 9.0.3-9 - limit-smp-16-threads.patch: Rediff so we don't ship a .orig file (#500316)