From 293fded4653eb79e4309e17996dfd4b7961477f7 Mon Sep 17 00:00:00 2001 From: Michael E Brown Date: Oct 22 2007 16:19:26 +0000 Subject: - huge number of changes upstream - convert to setuid wrapper instead of old setuid helper - lots of bugfixes and improvements - /var/cache/yum now saved and bind-mounted - ccache integration - rootcache improvements (formerly called autocache) --- diff --git a/.cvsignore b/.cvsignore index f716c6e..fe5cb03 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -mock-0.7.6.tar.gz +mock-0.8.2.tar.gz diff --git a/arch-specific-repo.patch b/arch-specific-repo.patch deleted file mode 100644 index 3227156..0000000 --- a/arch-specific-repo.patch +++ /dev/null @@ -1,333 +0,0 @@ ---- etc/fedora-4-ppc-core.cfg.jk 2006-11-03 15:16:00.000000000 -0500 -+++ etc/fedora-4-ppc-core.cfg 2006-11-03 15:30:39.000000000 -0500 -@@ -20,11 +20,11 @@ - - [core] - name=core --mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-4 -+baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/4/ppc/os - - [updates-released] - name=updates --mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc4 -+baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/updates/4/ppc - - [groups] - name=groups -@@ -32,7 +32,7 @@ - - [extras] - name=extras --mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-4 -+baseurl=http://download.fedoraproject.org/pub/fedora/linux/extras/4/ppc - - [local] - name=local ---- etc/fedora-5-i386-core.cfg.jk 2006-11-03 15:16:00.000000000 -0500 -+++ etc/fedora-5-i386-core.cfg 2006-11-03 15:43:12.000000000 -0500 -@@ -20,11 +20,11 @@ - - [core] - name=core --mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-5 -+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=core-5&arch=i386 - - [updates-released] - name=updates --mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc5 -+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-fc5&arch=i386 - - [groups] - name=groups -@@ -32,7 +32,7 @@ - - [extras] - name=extras --mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-5 -+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-5&arch=i386 - - [local] - name=local ---- etc/fedora-3-i386-core.cfg.jk 2006-11-03 15:16:00.000000000 -0500 -+++ etc/fedora-3-i386-core.cfg 2006-11-03 15:25:55.000000000 -0500 -@@ -19,11 +19,11 @@ - - [core] - name=core --mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-3 -+baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/3/i386/os - - [updates-released] - name=updates --mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc3 -+baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/updates/3/i386 - - - [groups] -@@ -32,7 +32,7 @@ - - [extras] - name=extras --mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-3 -+baseurl=http://download.fedoraproject.org/pub/fedora/linux/extras/3/i386 - - [local] - name=local ---- etc/fedora-5-x86_64-core.cfg.jk 2006-11-03 15:16:00.000000000 -0500 -+++ etc/fedora-5-x86_64-core.cfg 2006-11-03 15:46:11.000000000 -0500 -@@ -21,11 +21,11 @@ - - [core] - name=core --mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-5 -+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=core-5&arch=x86_64 - - [updates-released] - name=updates --mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc5 -+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-fc5&arch=x86_64 - - [groups] - name=groups -@@ -33,7 +33,7 @@ - - [extras] - name=extras --mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-5 -+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-5&arch=x86_64 - - [local] - name=local ---- etc/fedora-5-ppc-core.cfg.jk 2006-11-03 15:16:00.000000000 -0500 -+++ etc/fedora-5-ppc-core.cfg 2006-11-03 15:44:53.000000000 -0500 -@@ -20,11 +20,11 @@ - - [core] - name=core --mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-5 -+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=core-5&arch=ppc - - [updates-released] - name=updates --mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc5 -+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-fc5&arch=ppc - - [groups] - name=groups -@@ -32,7 +32,7 @@ - - [extras] - name=extras --mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-5 -+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-5&arch=ppc - - [local] - name=local ---- etc/fedora-6-x86_64-core.cfg.jk 2006-11-03 15:16:00.000000000 -0500 -+++ etc/fedora-6-x86_64-core.cfg 2006-11-03 15:50:34.000000000 -0500 -@@ -21,7 +21,11 @@ - - [core] - name=core --mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-6 -+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=core-6&arch=x86_64 -+ -+[updates-released] -+name=updates -+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-fc6&arch=x86_64 - - [groups] - name=groups -@@ -29,7 +33,7 @@ - - [extras] - name=extras --mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-6 -+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-6&arch=x86_64 - - [local] - name=local ---- etc/fedora-devel-x86_64-core.cfg.jk 2006-11-03 15:16:00.000000000 -0500 -+++ etc/fedora-devel-x86_64-core.cfg 2006-11-03 15:57:08.000000000 -0500 -@@ -21,7 +21,7 @@ - - [core] - name=core --mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-rawhide -+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=x86_64 - - [groups] - name=groups -@@ -29,7 +29,7 @@ - - [extras] - name=extras --mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-devel -+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-devel&arch=x86_64 - - [local] - name=local ---- etc/fedora-4-x86_64-core.cfg.jk 2006-11-03 15:16:00.000000000 -0500 -+++ etc/fedora-4-x86_64-core.cfg 2006-11-03 15:31:21.000000000 -0500 -@@ -20,12 +20,12 @@ - - [core] - name=core --mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-4 -+baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/4/x86_64/os - - - [updates-released] - name=updates --mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc4 -+baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/updates/4/x86_64 - - [groups] - name=groups -@@ -33,6 +33,7 @@ - - [extras] - name=extras -+baseurl=http://download.fedoraproject.org/pub/fedora/linux/extras/4/x86_64 - mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-4 - - [local] ---- etc/fedora-3-x86_64-core.cfg.jk 2006-11-03 15:16:00.000000000 -0500 -+++ etc/fedora-3-x86_64-core.cfg 2006-11-03 15:59:55.000000000 -0500 -@@ -19,12 +19,12 @@ - - [core] - name=core --mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-3 -+baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/3/x86_64/os - - - [updates-released] - name=updates --mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc3 -+baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/updates/3/x86_64 - - [groups] - name=groups -@@ -32,7 +32,7 @@ - - [extras] - name=extras --mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-3 -+baseurl=http://download.fedoraproject.org/pub/fedora/linux/extras/3/x86_64 - - [local] - name=local ---- etc/fedora-devel-ppc-core.cfg.jk 2006-11-03 15:16:00.000000000 -0500 -+++ etc/fedora-devel-ppc-core.cfg 2006-11-03 15:56:39.000000000 -0500 -@@ -20,7 +20,7 @@ - - [core] - name=core --mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-rawhide -+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=ppc - - [groups] - name=groups -@@ -28,7 +28,7 @@ - - [extras] - name=extras --mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-devel -+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-devel&arch=ppc - - [local] - name=local ---- etc/fedora-devel-i386-core.cfg.jk 2006-11-03 15:16:00.000000000 -0500 -+++ etc/fedora-devel-i386-core.cfg 2006-11-03 15:55:54.000000000 -0500 -@@ -20,7 +20,7 @@ - - [core] - name=core --mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-rawhide -+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=i386 - - [groups] - name=groups -@@ -28,7 +28,7 @@ - - [extras] - name=extras --mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-devel -+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-devel&arch=i386 - - [local] - name=local ---- etc/fedora-4-i386-core.cfg.jk 2006-11-03 15:16:00.000000000 -0500 -+++ etc/fedora-4-i386-core.cfg 2006-11-03 15:29:44.000000000 -0500 -@@ -20,11 +20,11 @@ - - [core] - name=core --mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-4 -+baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/4/i386/os - - [updates-released] - name=updates --mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc4 -+baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/updates/4/i386 - - - [groups] -@@ -33,7 +33,7 @@ - - [extras] - name=extras --mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-4 -+baseurl=http://download.fedoraproject.org/pub/fedora/linux/extras/4/i386 - - [local] - name=local ---- etc/fedora-6-i386-core.cfg.jk 2006-11-03 15:16:00.000000000 -0500 -+++ etc/fedora-6-i386-core.cfg 2006-11-03 15:48:02.000000000 -0500 -@@ -20,7 +20,11 @@ - - [core] - name=core --mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-6 -+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=core-6&arch=i386 -+ -+[updates-released] -+name=updates -+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-fc6&arch=i386 - - [groups] - name=groups -@@ -28,7 +32,7 @@ - - [extras] - name=extras --mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-6 -+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-6&arch=i386 - - [local] - name=local ---- etc/fedora-6-ppc-core.cfg.jk 2006-11-03 15:16:00.000000000 -0500 -+++ etc/fedora-6-ppc-core.cfg 2006-11-03 15:49:06.000000000 -0500 -@@ -20,7 +20,11 @@ - - [core] - name=core --mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-6 -+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=core-6&arch=ppc -+ -+[updates-released] -+name=updates -+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-fc6&arch=ppc - - [groups] - name=groups -@@ -28,7 +32,7 @@ - - [extras] - name=extras --mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-6 -+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-6&arch=ppc - - [local] - name=local diff --git a/mock.spec b/mock.spec index f3282c0..ba31d60 100644 --- a/mock.spec +++ b/mock.spec @@ -1,15 +1,25 @@ +# these are all substituted by autoconf +%define major 0 +%define minor 8 +%define sub 2 +%define extralevel %{nil} +%define release_name mock +%define release_version %{major}.%{minor}.%{sub}%{extralevel} + +%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} + Summary: Builds packages inside chroots Name: mock -Version: 0.7.6 +Version: %{release_version} 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.4 +Requires: python, yum >= 2.4, tar, gzip Requires(pre): shadow-utils -BuildRequires: libselinux-devel +BuildRequires: python-devel %description Mock takes a srpm and builds it in a chroot @@ -18,34 +28,13 @@ Mock takes a srpm and builds it in a chroot %setup -q %build -make CFLAGS="$RPM_OPT_FLAGS" +%configure +make %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install -# make the default.cfg link -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}.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 +mkdir -p $RPM_BUILD_ROOT/var/lib/mock %clean rm -rf $RPM_BUILD_ROOT @@ -57,17 +46,32 @@ fi %files %defattr(-, root, root) -%doc README ChangeLog buildsys-build.spec +%doc README ChangeLog buildsys-build.spec-template + +# python stuff +%{_libexecdir}/mock.py* +%{python_sitelib}/* + +# config files %dir %{_sysconfdir}/%{name} %config(noreplace) %{_sysconfdir}/%{name}/*.cfg -%{_bindir}/%{name} -%{_libexecdir}/mock-yum +%config(noreplace) %{_sysconfdir}/%{name}/*.ini + +# binary is setuid, but only runnable by group 'mock' +%attr(04770, root, mock) %{_bindir}/%{name} + %{_mandir}/man1/mock.1* -%attr(04750, root, mock) %{_sbindir}/mock-helper %attr(02775, root, mock) %dir /var/lib/mock -%{_libdir}/libselinux-mock.so %changelog +* Fri Oct 20 2007 Michael Brown - 0.8.0-1 +- huge number of changes upstream +- convert to setuid wrapper instead of old setuid helper +- lots of bugfixes and improvements +- /var/cache/yum now saved and bind-mounted +- ccache integration +- rootcache improvements (formerly called autocache) + * Mon Aug 27 2007 Michael Brown - 0.7.6-1 - ensure /etc/hosts is created in chroot properly diff --git a/sources b/sources index 3e828e8..1f82afe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -35a5a771a32d93e8067ae3737456772b mock-0.7.6.tar.gz +bb3853dcfddd64b36611bc80a4266f2b mock-0.8.2.tar.gz