From c118de4c8d2224cb67e039ac2cb75ad4e35eaea3 Mon Sep 17 00:00:00 2001 From: Michael E Brown Date: Jun 12 2007 20:42:33 +0000 Subject: - fixed bind mount problems - added code to allow multiple users to use --no-clean - merged mock-0-6-branch to head and changed version --- diff --git a/.cvsignore b/.cvsignore index b493831..6f0b7e0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -mock-0.6.12.tar.gz +mock-0.7.0.tar.gz diff --git a/mock.spec b/mock.spec index 616f976..a3037a5 100644 --- a/mock.spec +++ b/mock.spec @@ -1,17 +1,16 @@ Summary: Builds packages inside chroots Name: mock -Version: 0.6.12 +Version: 0.7.0 Release: 1%{?dist} License: GPL Group: Development/Tools Source: http://fedoraproject.org/projects/mock/releases/%{name}-%{version}.tar.gz URL: http://fedoraproject.org/wiki/Projects/Mock BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: python, yum >= 2.2.1 +Requires: python, yum >= 3.0 Requires(pre): shadow-utils BuildRequires: libselinux-devel - %description Mock takes a srpm and builds it in a chroot @@ -19,7 +18,7 @@ Mock takes a srpm and builds it in a chroot %setup -q %build -make +make CFLAGS="$RPM_OPT_FLAGS" %install rm -rf $RPM_BUILD_ROOT @@ -30,19 +29,21 @@ cd $RPM_BUILD_ROOT/%{_sysconfdir}/%{name} %if 0%{?fedora:1} if [ -f fedora-%{fedora}-%{_target_cpu}-core.cfg ]; then ln -s fedora-%{fedora}-%{_target_cpu}-core.cfg default.cfg +elif [ -f fedora-%{fedora}-%{_target_cpu}.cfg ]; then + ln -s fedora-%{fedora}-%{_target_cpu}.cfg default.cfg fi %endif # if we haven't created a default link yet, try to do so as devel if [ ! -f default.cfg ]; then - if [ -f fedora-development-%{_target_cpu}-core.cfg ]; then - ln -s fedora-development-%{_target_cpu}-core.cfg default.cfg - elif [ -f fedora-devel-%{_target_cpu}-core.cfg ]; then - ln -s fedora-devel-%{_target_cpu}-core.cfg default.cfg - elif [ -f fedora-development-i386-core.cfg ]; then - ln -s fedora-development-i386-core.cfg default.cfg - elif [ -f fedora-devel-i386-core.cfg ]; then - ln -s fedora-devel-i386-core.cfg default.cfg + if [ -f fedora-development-%{_target_cpu}.cfg ]; then + ln -s fedora-development-%{_target_cpu}.cfg default.cfg + elif [ -f fedora-devel-%{_target_cpu}.cfg ]; then + ln -s fedora-devel-%{_target_cpu}.cfg default.cfg + elif [ -f fedora-development-i386.cfg ]; then + ln -s fedora-development-i386.cfg default.cfg + elif [ -f fedora-devel-i386.cfg ]; then + ln -s fedora-devel-i386.cfg default.cfg fi fi @@ -67,11 +68,38 @@ fi %{_libdir}/libselinux-mock.so %changelog +* Mon Jun 11 2007 Clark Williams - 0.7-1 +- fixed bind mount problems +- added code to allow multiple users to use --no-clean +- merged mock-0-6-branch to head and changed version + +* Thu Jun 7 2007 Clark Williams - 0.6.17-1 +- added F-7 config files (BZ#242276) +- modified epel configs for changed mirrorlist location (BZ#239981) +- added bind mount of /dev (BZ#236428) +- added copy of /etc/resolv.conf to chroot (BZ#237663 and BZ#238101) + +* Tue May 01 2007 Clark Williams - 0.6.16-1 +- timeout code adds new cmdline option that will kill build process after + specified timeout. Useful for automated builds of things that may hang during + build and you just want it to fail. + +* Tue Apr 10 2007 Clark Williams - 0.6.15-1 +- Fixed typo in FC4 -epel configs (BZ 235490) + +* Sat Feb 24 2007 Clark Williams - 0.6.14-1 +- Ville Skyttä's fix for RPM_OPT_FLAGS (BZ 226673) + +* Tue Feb 20 2007 Clark Williams - 0.6.13-1 +- Handle --no-clean option when doing yum.conf symlink (BZ 230824) + * Fri Feb 16 2007 Clark Williams - 0.6.12-1 - added safety symlink for yum.conf -* Tue Feb 6 2007 Clark Williams - 0.6.11-1 +* Wed Feb 7 2007 Clark Williams - 0.6.11-1 - added error() calls to print command output on failed commands + +* Tue Feb 6 2007 Clark Williams - 0.6.11-1 - added installdeps command for long-term chroot management * Mon Jan 8 2007 Clark Williams - 0.6.10-1 @@ -86,15 +114,6 @@ fi - applied Jesse Keatings patch for arch specifi config files (BZ 213516) -* Mon Nov 6 2006 Jesse Keating - 0.6.8-4 -- Fix a couple typos pointing fc6 chroots to fe5. - -* Sat Nov 4 2006 Jesse Keating - 0.6.8-3 -- Fix a typo in the patch that added x86_64 repos for fc4ppc - -* Fri Nov 3 2006 Jesse Keating - 0.6.8-2 -- Add patch to fix repo files to use arch specific repos (#213516) - * Mon Oct 30 2006 Clark Williams - 0.6.8-1 - respun tarballs without buildsys rpms @@ -104,70 +123,38 @@ fi * Sat Oct 21 2006 Clark Williams - 0.6.6-1 - bumped version to 0.6.6 (fixed tarball problem) -* Wed Oct 04 2006 Jesse Keating - 0.6.5-1 -- new upstream version to fix #151255 - -* Tue Aug 29 2006 Jesse Keating - 0.6.4-1 -- new upstream version to fix #204051 - -* Wed Aug 23 2006 Jesse Keating - 0.6.2-1 -- new upstream version - -* Fri Aug 18 2006 Jesse Keating - 0.6.1-1 -- new upstream version -- Fixes in spec from upstream - - Added buildsys-build specfile to docs - -* Fri Jun 23 2006 Jesse Keating - 0.6-4 -- And fix the link syntax. - -* Wed Jun 21 2006 Jesse Keating - 0.6-3 -- Add patch symlink fedora-6 to development, not 5. +* Mon Sep 11 2006 Clark Williams - 0.6.5-1 +- changed version number for patch from Karanbir Singh + (rpm workaround on CentOS 4.4) -* Tue Jun 20 2006 Jesse Keating - 0.6-1 -- New upstream version 0.6 +* Tue Aug 29 2006 Clark Williams - 0.6.3-1 +- changed version number to indicate fix for bz 204051 -* Tue Mar 21 2006 Dan Williams - 0.4-8 -- bump release for fc5/fc6 split +* Tue Aug 29 2006 Clark Williams - 0.6.2-2 +- bumped revision for bz 204051 -* Tue Mar 21 2006 Dan Williams - 0.4-7 -- Update to mock CVS; add symlinks for /dev/std[in|out|err] to buildroots +* Wed Aug 23 2006 Clark Williams - 0.6.2-1 +- Updated README +- Fixed link problem in etc/Makefile +- Bumped version number -* Thu Mar 2 2006 Seth Vidal - 0.4-6 -- iterate for gcc rebuild and fc5 final +* Wed Aug 16 2006 Clark Williams +- Added buildsys-build specfile to docs +- Added disttag +- Bumped release number -* Tue Jan 24 2006 Dan Williams - 0.4-5 -- Back out setpgrp patch, found a better way to do it in plague +* Wed Jun 7 2006 Seth Vidal +- version update -* Tue Jan 24 2006 Dan Williams - 0.4-4 -- Add option to create new process group so mock and its children - may be more easily killed - -* Wed Jan 18 2006 Dan Williams - 0.4-3 -- Add unpackaged files fix from RH#163576 (Adrian Reber) +* Tue Apr 11 2006 Seth Vidal +- specfile version iterate * Tue Dec 27 2005 Seth Vidal - add patch from Andreas Thienemann - adds man page -* Tue Aug 16 2005 Matthias Saou 0.4-2 -- Fix ?fedora check when not defined (would fail to parse). - -* Thu Aug 4 2005 Seth Vidal -- 0.4 -- update urls -- add in selinux buildreq and mock-yum file - -* Sun Jun 12 2005 Jeremy Katz -- set default.cfg based on both arch and distro built for - * Sat Jun 11 2005 Seth Vidal - security fix in mock-helper -* Sat Jun 11 2005 Seth Vidal -- mock 0.3 - security release -- mock-helper allowed execution of arbitrary commands by member of mock - group - * Sun Jun 5 2005 Seth Vidal - clean up packaging for fedora extras diff --git a/sources b/sources index b8ea54a..a9d7e72 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8e63c0452a58d4d0578b3ddb1631d0f2 mock-0.6.12.tar.gz +0b2d6a72cd92108dff790a55a4e8ab6a mock-0.7.0.tar.gz