mock ChangeLog, 1.11, 1.12 Makefile, 1.13, 1.14 mock.py, 1.59, 1.60 mock.spec, 1.21, 1.22

Author: jcwillia

Update of /cvs/fedora/mock
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19396

Modified Files:
	ChangeLog Makefile mock.py mock.spec 
Log Message:
merged latest mock-0-6-branch fixes


Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/mock/ChangeLog,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ChangeLog	4 Jan 2007 16:10:48 -0000	1.11
+++ ChangeLog	8 Jan 2007 22:50:36 -0000	1.12
@@ -1,9 +1,27 @@
[phone]  Clark Williams  <williams(a)redhat.com&gt;
+	* 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(a)redhat.com&gt;
 	
 	* mock.py, Makefile, etc/*.cfg
 	merged BZ fixes from mock-0.6 branch
 	
-2006-09-08  Clark Williams  <williams(a)redhat.com&gt;
[phone]  Clark Williams  <williams(a)redhat.com&gt;
+
+	* Makefile
+	Bumped version to 0.6.7 for FC6 release
+
+	* etc/fedora-6-*
+	Added for FC6 release
+
[phone]  Clark Williams  <williams(a)redhat.com&gt;
 
 	* mock.c
 	changed MOCK_PATH to /usr/libexec/mock.py


Index: Makefile
===================================================================
RCS file: /cvs/fedora/mock/Makefile,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Makefile	4 Jan 2007 16:10:48 -0000	1.13
+++ Makefile	8 Jan 2007 22:50:36 -0000	1.14
@@ -24,10 +24,13 @@
 	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)


Index: mock.py
===================================================================
RCS file: /cvs/fedora/mock/mock.py,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- mock.py	4 Jan 2007 16:10:48 -0000	1.59
+++ mock.py	8 Jan 2007 22:50:36 -0000	1.60
@@ -781,6 +781,7 @@
         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()
         


Index: mock.spec
===================================================================
RCS file: /cvs/fedora/mock/mock.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- mock.spec	4 Jan 2007 16:10:48 -0000	1.21
+++ mock.spec	8 Jan 2007 22:50:36 -0000	1.22
@@ -54,8 +54,6 @@
     groupadd -r mock >/dev/null 2>&1 || :
 fi
 
-
-
 %files
 %defattr(-, root, root)
 %doc README ChangeLog buildsys-build.spec
@@ -67,8 +65,10 @@
 %attr(02775, root, mock) %dir /var/lib/mock
 %{_libdir}/libselinux-mock.so
 
-
 %changelog
+* Mon Jan  8 2007 Clark Williams <williams(a)redhat.com&gt;
+- Added Josh Boyer's EPEL config files
+
 * Wed Jan  3 2007 Clark Williams <williams(a)redhat.com&gt;
 - Merged mock-0.6 BZ fixes into head