diff --git a/.cvsignore b/.cvsignore index d2ef292..4a56427 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -mock-0.9.14.tar.gz +mock-0.9.16.tar.gz 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 deleted file mode 100644 index a715f98..0000000 --- a/0001-default-build-arch-to-i586-for-rawhide-to-match-fedo.patch +++ /dev/null @@ -1,26 +0,0 @@ -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/import.log b/import.log new file mode 100644 index 0000000..abace0d --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +mock-0_9_16-1_fc11:F-11:mock-0.9.16-1.fc11.src.rpm:1242093788 diff --git a/mock.spec b/mock.spec index 732e8dc..a847e42 100644 --- a/mock.spec +++ b/mock.spec @@ -1,7 +1,7 @@ # next four lines substituted by autoconf %define major 0 %define minor 9 -%define sub 14 +%define sub 16 %define extralevel %{nil} %define release_name mock %define release_version %{major}.%{minor}.%{sub}%{extralevel} @@ -11,11 +11,10 @@ Summary: Builds packages inside chroots Name: mock Version: %{release_version} -Release: 3%{?dist} +Release: 1%{?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 @@ -28,7 +27,6 @@ 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' \ @@ -99,11 +97,11 @@ 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 +* Mon May 11 2009 Jesse Keating - 0.9.16-1 +- Make F11 and rawhide build i586 on i386 targets. -* Wed Feb 25 2009 Fedora Release Engineering - 0.9.14-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild +* Mon May 11 2009 Jesse Keating - 0.9.15-1 +- Add configs for F11 (jkeating) * Mon Feb 02 2009 Clark Williams - 0.9.14-1 - logging cleanup (mikem) diff --git a/sources b/sources index 8f5f787..af3dd5b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -81b128d08c81e61100e60f9daadeab2a mock-0.9.14.tar.gz +74e7d9d34996d9c2c85209430fa53bd6 mock-0.9.16.tar.gz