diff --git a/.cvsignore b/.cvsignore index 4e72f4b..b77f8de 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -mock-0.9.7.tar.gz +mock-0.9.11.tar.gz diff --git a/mock.spec b/mock.spec index b70276b..0a4c1b6 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 7 +%define sub 11 %define extralevel %{nil} %define release_name mock %define release_version %{major}.%{minor}.%{sub}%{extralevel} @@ -14,7 +14,6 @@ Version: %{release_version} Release: 1%{?dist} License: GPLv2+ Group: Development/Tools -#Source: https://fedorahosted.org/mock/attachment/wiki/MockTarballs/%{name}-%{version}.tar.gz?format=raw Source: https://fedorahosted.org/mock/attachment/wiki/MockTarballs/%{name}-%{version}.tar.gz URL: http://fedoraproject.org/wiki/Projects/Mock BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -28,6 +27,12 @@ Mock takes a srpm and builds it in a chroot %prep %setup -q +%if "%{?dist}" == ".fc8" +pushd etc/mock +sed -i -e 's/^#exclude=/exclude=/' -e '/^# The above is not/d' \ + fedora-9-x86_64.cfg fedora-rawhide-x86_64.cfg +popd +%endif %build %configure @@ -48,6 +53,11 @@ ln -s epel-4-x86_64.cfg fedora-4-x86_64-epel.cfg ln -s epel-5-i386.cfg fedora-5-i386-epel.cfg ln -s epel-5-ppc.cfg fedora-5-ppc-epel.cfg ln -s epel-5-x86_64.cfg fedora-5-x86_64-epel.cfg +# more compat, from devel/rawhide rename +ln -s fedora-rawhide-i386.cfg fedora-devel-i386.cfg +ln -s fedora-rawhide-x86_64.cfg fedora-devel-x86_64.cfg +ln -s fedora-rawhide-ppc.cfg fedora-devel-ppc.cfg +ln -s fedora-rawhide-ppc64.cfg fedora-devel-ppc64.cfg popd %clean @@ -83,6 +93,25 @@ fi %attr(02775, root, mock) %dir /var/lib/mock %changelog +* Thu Sep 4 2008 Clark Williams - 0.9.11-1 +- added workarounds for rawhide rpm (BZ 455387 and 458234) +- disabled tmpfs plugin on epel-4-x86_64 +- fixed autotools breakage in configure.ac + +* Tue May 20 2008 Jesse Keating - 0.9.10-1 +- added fix for building F-8 mock (clark) +- Update epel configs + +* Tue Apr 22 2008 Jesse Keating - 0.9.9-1 +- Update config files for Fedora 9 +- Comment out multilib excludes, no longer needed in F9+ with yum multilib changes + +* Mon Mar 31 2008 Jesse Keating - 0.9.8-1 +- modify rootcache logic to rebuild cache if config files have newer timestamp +- For Fedora 8 and higher, use priority failover method +- Point to the correct static-repo for rawhide stuff. +- Move "devel" to "rawhide" to match current Fedora naming schemes. + * Thu Jan 31 2008 Michael Brown - 0.9.7-1 - redo mock.util.do() to use python subprocess module, which should be much more maintainable than our old homegrown code. diff --git a/sources b/sources index 7626545..d8f1f88 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6dc38e4cc22800a21192b6e854f99ef5 mock-0.9.7.tar.gz +eec7aa72ba1d4cd92552a73c16d3b44e mock-0.9.11.tar.gz