diff --git a/0001-default-build-arch-to-i586-for-rawhide-to-match-fedo.patch b/0001-default-build-arch-to-i586-for-rawhide-to-match-fedo.patch new file mode 100644 index 0000000..a715f98 --- /dev/null +++ b/0001-default-build-arch-to-i586-for-rawhide-to-match-fedo.patch @@ -0,0 +1,26 @@ +From b081dc27156a125a123fdefe901588cde728f68d Mon Sep 17 00:00:00 2001 +From: Dennis Gilmore +Date: Sun, 1 Mar 2009 14:42:04 -0600 +Subject: [PATCH] default build arch to i586 for rawhide to match fedora + +--- + etc/mock/fedora-rawhide-i386.cfg | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/etc/mock/fedora-rawhide-i386.cfg b/etc/mock/fedora-rawhide-i386.cfg +index 8924ab6..c686718 100644 +--- a/etc/mock/fedora-rawhide-i386.cfg ++++ b/etc/mock/fedora-rawhide-i386.cfg +@@ -1,7 +1,7 @@ + config_opts['root'] = 'fedora-rawhide-i386' +-config_opts['target_arch'] = 'i386' ++config_opts['target_arch'] = 'i586' + config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build' +-config_opts['dist'] = 'fc10' # only useful for --resultdir variable subst ++config_opts['dist'] = 'fc11' # only useful for --resultdir variable subst + + config_opts['yum.conf'] = """ + [main] +-- +1.6.1.3 + diff --git a/mock.spec b/mock.spec index 22122a6..732e8dc 100644 --- a/mock.spec +++ b/mock.spec @@ -11,10 +11,11 @@ Summary: Builds packages inside chroots Name: mock Version: %{release_version} -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: Development/Tools Source: https://fedorahosted.org/mock/attachment/wiki/MockTarballs/%{name}-%{version}.tar.gz +Patch0: 0001-default-build-arch-to-i586-for-rawhide-to-match-fedo.patch URL: http://fedoraproject.org/wiki/Projects/Mock BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -27,6 +28,7 @@ Mock takes a srpm and builds it in a chroot %prep %setup -q +%patch0 -p1 %if "%{?dist}" == ".fc8" pushd etc/mock sed -i -e 's/^#exclude=/exclude=/' -e '/^# The above is not/d' \ @@ -97,6 +99,9 @@ fi %attr(02775, root, mock) %dir /var/cache/mock %changelog +* Wed Feb 29 2009 Dennis Gilmore - 0.9.14-3 +- add patch defaulting i386 to build i586 on rawhide + * Wed Feb 25 2009 Fedora Release Engineering - 0.9.14-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild