mock Makefile, 1.8.2.5, 1.8.2.6 buildsys-build.spec, 1.2.2.7, 1.2.2.8 mock.py, 1.53.2.6, 1.53.2.7

[John Clark Williams (jcwillia)]

Author: jcwillia

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

Modified Files:
      Tag: mock-0-6-branch
	Makefile buildsys-build.spec mock.py 
Log Message:
added David Lutterkort's patch for RHEL


Index: Makefile
===================================================================
RCS file: /cvs/fedora/mock/Makefile,v
retrieving revision 1.8.2.5
retrieving revision 1.8.2.6
diff -u -r1.8.2.5 -r1.8.2.6
--- Makefile	21 Oct 2006 19:04:02 -0000	1.8.2.5
+++ Makefile	14 Dec 2006 19:20:38 -0000	1.8.2.6
@@ -53,7 +53,7 @@
 		rpmbuild $(RPMARGS) --define "fedora $$i" --define "dist .fc$$i" -bb buildsys-build.spec; \
 	done
 	for i in 3 4; do \
-		rpmbuild $(RPMARGS) --define "el $$i" --define "dist .el$$i" -bb buildsys-build.spec; \
+		rpmbuild $(RPMARGS) --define "rhel $$i" --define "dist .el$$i" -bb buildsys-build.spec; \
 	done
 	for i in 73 8 9; do \
 		rpmbuild $(RPMARGS) --define "rhl $$i" --define "dist .rh$$i" -bb buildsys-build.spec; \


Index: buildsys-build.spec
===================================================================
RCS file: /cvs/fedora/mock/buildsys-build.spec,v
retrieving revision 1.2.2.7
retrieving revision 1.2.2.8
diff -u -r1.2.2.7 -r1.2.2.8
--- buildsys-build.spec	29 Aug 2006 19:55:58 -0000	1.2.2.7
+++ buildsys-build.spec	14 Dec 2006 19:20:38 -0000	1.2.2.8
@@ -3,7 +3,7 @@
 #
 Summary: The base set of packages for a mock chroot
 Name: buildsys-build
-Version: 0.6
+Version: 0.6.1
 Release: 1%{?dist}
 License: GPL
 Group: Development/Build Tools
@@ -45,12 +45,12 @@
 %endif
 
 # RHEL block
-%if "%{?el}" != ""
+%if "%{?rhel}" != ""
 Requires: redhat-release
 Requires: coreutils
 Requires: elfutils
 Requires: redhat-rpm-config
-%if "%{?el}" == "4"
+%if "%{?rhel}" == "4"
 Requires: python
 %endif
 %endif
@@ -80,11 +80,9 @@
 Requires: redhat-rpm-config
 %if "%{?aurora}" == "2" 
 Requires: elfutils
-%if "%{?aurora}" == "2" 
 Requires: python
 %endif
 %endif
-%endif
 
 
 %description
@@ -104,9 +102,14 @@
 %doc
 
 %changelog
+* Thu Dec 14 2006 Clark Williams <williams at redhat.com> - 0.6.1-1
+- added fix from David Lutterkort for RHEL
+- refactored some conditional blocks for simplicity
+- added this entry for Dennis Gilmore's aurora SPARC fixes
+
 * Tue Aug 29 2006 Clark Williams <williams at redhat.com> - 0.6-1
 - added rhl buildsys-build rpms
-
+ 
 * Mon Aug  7 2006 Clark Williams <williams at redhat.com> - 0.5-4
 - added rhel build tags
 


Index: mock.py
===================================================================
RCS file: /cvs/fedora/mock/mock.py,v
retrieving revision 1.53.2.6
retrieving revision 1.53.2.7
diff -u -r1.53.2.6 -r1.53.2.7
--- mock.py	21 Nov 2006 20:11:17 -0000	1.53.2.6
+++ mock.py	14 Dec 2006 19:20:38 -0000	1.53.2.7
@@ -19,7 +19,10 @@
 import os.path
 import sys
 import rpmUtils
-import rpmUtils.transaction
+try:
+    test = rpmUtils.transaction.initReadOnlyTransaction()
+except:
+    import rpmUtils.transaction
 import rpm
 import glob
 import shutil