merged latest mock-0-6-branch fixes

7 files changed, 144 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index de714a6..88a79df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,27 @@
+2007-01-08  Clark Williams  <williams@redhat.com>
+	* Makefile
+	changed archive creation to keep tarball clean
+
+	* etc/fedora-4-*
+	added Josh Boyer's EPEL config files
+
+	* mock.spec
+	bumped version to 0.6.10
+	
 2007-01-03  Clark Williams  <williams@redhat.com>
 	
 	* mock.py, Makefile, etc/*.cfg
 	merged BZ fixes from mock-0.6 branch
 	
-2006-09-08  Clark Williams  <williams@redhat.com>
+2006-10-30  Clark Williams  <williams@redhat.com>
+
+	* Makefile
+	Bumped version to 0.6.7 for FC6 release
+
+	* etc/fedora-6-*
+	Added for FC6 release
+
+2006-10-21  Clark Williams  <williams@redhat.com>
 
 	* mock.c
 	changed MOCK_PATH to /usr/libexec/mock.py
diff --git a/Makefile b/Makefile
index 6b0718d..a36b939 100644
--- a/Makefile
+++ b/Makefile
@@ -24,10 +24,13 @@ install:
 	mkdir -p $(DESTDIR)/var/lib/mock
 	for d in $(SUBDIRS); do make  DESTDIR=`cd $(DESTDIR); pwd` -C $$d install; [ $$? = 0 ] || exit 1; done
 
+EXCLUDES	:= --exclude='*~' --exclude='*.patch' --exclude='*.save' \
+		   --exclude='*.rpm' --exclude='*.diff' --exclude='*.sh' \
+		   --exclude='*.tar.gz' --exclude='*.tar.bz2' --exclude='*test*'
 archive: clean
 	@rm -rf ${PKGNAME}-*.tar.gz
 	@rm -rf /tmp/${PKGNAME}-$(VERSION) /tmp/${PKGNAME}
-	@dir=$$PWD; cd /tmp; cp -a $$dir ${PKGNAME}
+	@rsync -a $(EXCLUDES) . /tmp/${PKGNAME}
 	@rm -rf /tmp/${PKGNAME}/${PKGNAME}-daily.spec /tmp/${PKGNAME}/build /tmp/${PKGNAME}/dist
 	@mv /tmp/${PKGNAME} /tmp/${PKGNAME}-$(VERSION)
 	@dir=$$PWD; cd /tmp; tar cvz --exclude=CVS --exclude=.cvsignore -f $$dir/${PKGNAME}-$(VERSION).tar.gz ${PKGNAME}-$(VERSION)
diff --git a/etc/fedora-4-i386-epel.cfg b/etc/fedora-4-i386-epel.cfg
new file mode 100644
index 0000000..2a5b17a
--- /dev/null
+++ b/etc/fedora-4-i386-epel.cfg
@@ -0,0 +1,39 @@
+#!/usr/bin/python -tt
+import os
+config_opts['root'] = 'epel-4-i386'
+config_opts['target_arch'] = 'i386'
+
+config_opts['yum.conf'] = """
+[main]
+cachdir=/var/cache/yum
+debuglevel=1
+logfile=/var/log/yum.log
+reposdir=/dev/null
+retries=20
+obsoletes=1
+gpgcheck=0
+assumeyes=1
+
+# repos
+
+[core]
+name=base
+mirrorlist=http://mirror.centos.org/?release=4&arch=i386&repo=os
+
+[update]
+name=updates
+mirrorlist=http://mirror.centos.org/?release=4&arch=i386&repo=updates
+
+[groups]
+name=groups
+baseurl=http://buildsys.fedoraproject.org/buildgroups/rhel4/i386/
+
+[extras]
+name=epel
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-4&arch=i386
+
+[local]
+name=local
+baseurl=http://buildsys.fedoraproject.org/plague-results/fedora-4-epel/
+
+"""
diff --git a/etc/fedora-4-ppc-epel.cfg b/etc/fedora-4-ppc-epel.cfg
new file mode 100644
index 0000000..d273a51
--- /dev/null
+++ b/etc/fedora-4-ppc-epel.cfg
@@ -0,0 +1,39 @@
+#!/usr/bin/python -tt
+import os
+config_opts['root'] = 'epel-4-ppc'
+config_opts['target_arch'] = 'ppc'
+
+config_opts['yum.conf'] = """
+[main]
+cachdir=/var/cache/yum
+debuglevel=1
+logfile=/var/log/yum.log
+reposdir=/dev/null
+retries=20
+obsoletes=1
+gpgcheck=0
+assumeyes=1
+
+# repos
+
+[core]
+name=base
+mirrorlist=http://mirror.centos.org/?release=4&arch=ppc&repo=os
+
+[update]
+name=updates
+mirrorlist=http://mirror.centos.org/?release=4&arch=ppc&repo=updates
+
+[groups]
+name=groups
+baseurl=http://buildsys.fedoraproject.org/buildgroups/rhel4/ppc/
+
+[extras]
+name=epel
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-4&arch=ppc
+
+[local]
+name=local
+baseurl=http://buildsys.fedoraproject.org/plague-results/fedora-4-epel/
+
+"""
diff --git a/etc/fedora-4-x86_64-epel.cfg b/etc/fedora-4-x86_64-epel.cfg
new file mode 100644
index 0000000..03ad3ee
--- /dev/null
+++ b/etc/fedora-4-x86_64-epel.cfg
@@ -0,0 +1,39 @@
+#!/usr/bin/python -tt
+import os
+config_opts['root'] = 'epel-4-x86_64'
+config_opts['target_arch'] = 'x86_64'
+
+config_opts['yum.conf'] = """
+[main]
+cachdir=/var/cache/yum
+debuglevel=1
+logfile=/var/log/yum.log
+reposdir=/dev/null
+retries=20
+obsoletes=1
+gpgcheck=0
+assumeyes=1
+
+# repos
+
+[core]
+name=base
+mirrorlist=http://mirror.centos.org/?release=4&arch=x86_64&repo=os
+
+[update]
+name=updates
+mirrorlist=http://mirror.centos.org/?release=4&arch=x86_64&repo=updates
+
+[groups]
+name=groups
+baseurl=http://buildsys.fedoraproject.org/buildgroups/rhel4/x86_64/
+
+[extras]
+name=epel
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-4&arch=x86_64
+
+[local]
+name=local
+baseurl=http://buildsys.fedoraproject.org/plague-results/fedora-4-epel/
+
+"""
diff --git a/mock.py b/mock.py
index fb87c3c..b00d00b 100644
--- a/mock.py
+++ b/mock.py
@@ -781,6 +781,7 @@ class Root:
         macrofile_out = '%s%s/.rpmmacros' % (self.rootdir, self.homedir)
         if not os.path.exists(macrofile_out):
             rpmmacros = open(macrofile_out, 'w')
+            self.config['macros'] = self.config['macros'] + "\n%%_rpmlock_path	%s/var/lib/rpm/__db.000" % self.basedir
             rpmmacros.write(self.config['macros'])
             rpmmacros.close()
         
diff --git a/mock.spec b/mock.spec
index c4cbe32..498a037 100644
--- a/mock.spec
+++ b/mock.spec
@@ -54,8 +54,6 @@ if [ $1 -eq 1 ]; then
     groupadd -r mock >/dev/null 2>&1 || :
 fi
 
-
-
 %files
 %defattr(-, root, root)
 %doc README ChangeLog buildsys-build.spec
@@ -67,8 +65,10 @@ fi
 %attr(02775, root, mock) %dir /var/lib/mock
 %{_libdir}/libselinux-mock.so
 
-
 %changelog
+* Mon Jan  8 2007 Clark Williams <williams@redhat.com>
+- Added Josh Boyer's EPEL config files
+
 * Wed Jan  3 2007 Clark Williams <williams@redhat.com>
 - Merged mock-0.6 BZ fixes into head