diff options
| author | jcwillia <jcwillia> | 2006-12-14 19:20:38 +0000 |
|---|---|---|
| committer | jcwillia <jcwillia> | 2006-12-14 19:20:38 +0000 |
| commit | 8e769de7fd2e10a319b7b5936f42ed0ca2b049ad (patch) | |
| tree | 0d6e86f1569b9a29998ccf5d012070eacb97fb98 | |
| parent | f027f7ae2bcbdcbf80c0001ffa58d3d2ca7c9318 (diff) | |
| download | mock-8e769de7fd2e10a319b7b5936f42ed0ca2b049ad.tar.gz mock-8e769de7fd2e10a319b7b5936f42ed0ca2b049ad.tar.xz mock-8e769de7fd2e10a319b7b5936f42ed0ca2b049ad.zip | |
added David Lutterkort's patch for RHEL
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | buildsys-build.spec | 15 | ||||
| -rw-r--r-- | mock.py | 5 |
3 files changed, 14 insertions, 8 deletions
@@ -53,7 +53,7 @@ buildsys-rpm: 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; \ diff --git a/buildsys-build.spec b/buildsys-build.spec index f78108b..6fae012 100644 --- a/buildsys-build.spec +++ b/buildsys-build.spec @@ -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 @@ Requires: python %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: fedora-release Requires: redhat-rpm-config %if "%{?aurora}" == "2" Requires: elfutils -%if "%{?aurora}" == "2" Requires: python %endif %endif -%endif %description @@ -104,9 +102,14 @@ The base set of packages for a mock chroot. %doc %changelog +* Thu Dec 14 2006 Clark Williams <williams@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@redhat.com> - 0.6-1 - added rhl buildsys-build rpms - + * Mon Aug 7 2006 Clark Williams <williams@redhat.com> - 0.5-4 - added rhel build tags @@ -19,7 +19,10 @@ import os 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 |