diff --git a/.cvsignore b/.cvsignore index 226386e..4d2dfda 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -mock-1.0.5.tar.gz +mock-1.0.7.tar.gz diff --git a/0001-EL-5-doesnt-have-a-dev-pts-ptmx-node-it-only-has-the.patch b/0001-EL-5-doesnt-have-a-dev-pts-ptmx-node-it-only-has-the.patch deleted file mode 100644 index 83cdf01..0000000 --- a/0001-EL-5-doesnt-have-a-dev-pts-ptmx-node-it-only-has-the.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 8e42cf66e3350adf829687ea284b74116931aab9 Mon Sep 17 00:00:00 2001 -From: Dennis Gilmore -Date: Fri, 18 Dec 2009 10:32:51 -0600 -Subject: [PATCH] EL-5 doesnt have a /dev/pts/ptmx node it only has the actual /dev/ptmx one - So lets make the node in the chroot. as gcc, gdb and freinds are unbuildibale without it - ---- - py/mock/backend.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/py/mock/backend.py b/py/mock/backend.py -index ef4d90b..97cd8e9 100644 ---- a/py/mock/backend.py -+++ b/py/mock/backend.py -@@ -311,6 +311,7 @@ class Root(object): - (stat.S_IFCHR | 0444, os.makedev(1, 9), "dev/urandom"), - (stat.S_IFCHR | 0666, os.makedev(5, 0), "dev/tty"), - (stat.S_IFCHR | 0600, os.makedev(5, 1), "dev/console"), -+ (stat.S_IFCHR | 0666, os.makedev(5, 2), "dev/ptmx"), - ) - for i in devFiles: - # create node -@@ -324,7 +325,6 @@ class Root(object): - os.symlink("/proc/self/fd/0", self.makeChrootPath("dev/stdin")) - os.symlink("/proc/self/fd/1", self.makeChrootPath("dev/stdout")) - os.symlink("/proc/self/fd/2", self.makeChrootPath("dev/stderr")) -- os.symlink("/dev/pts/ptmx", self.makeChrootPath("dev/ptmx")) - os.umask(prevMask) - - # mount/umount --- -1.6.5.2 - diff --git a/import.log b/import.log new file mode 100644 index 0000000..c9d1e7c --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +mock-1_0_7-1_fc13:EL-5:mock-1.0.7-1.fc13.src.rpm:1268345296 diff --git a/mock-epel-config.patch b/mock-epel-config.patch deleted file mode 100644 index 7d4c2bc..0000000 --- a/mock-epel-config.patch +++ /dev/null @@ -1,117 +0,0 @@ -diff -uNr mock-0.9.14-orig/etc/mock/epel-4-i386.cfg mock-0.9.14/etc/mock/epel-4-i386.cfg ---- mock-0.9.14-orig/etc/mock/epel-4-i386.cfg 2009-02-01 22:00:04.000000000 -0600 -+++ mock-0.9.14/etc/mock/epel-4-i386.cfg 2009-09-02 12:43:53.000000000 -0500 -@@ -31,16 +31,20 @@ - name=groups - baseurl=http://buildsys.fedoraproject.org/buildgroups/rhel4/i386/ - --[extras] -+[stable] - name=epel - mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-4&arch=i386 - - [testing] - name=epel-testing -+enabled=0 - mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel4&arch=i386 - - [local] - name=local --baseurl=http://buildsys.fedoraproject.org/plague-results/fedora-4-epel/ -+baseurl=http://koji.fedoraproject.org/static-repos/dist-4E-epel-build-current/i386/ -+cost=2000 -+enabled=0 -+ - - """ -diff -uNr mock-0.9.14-orig/etc/mock/epel-4-ppc.cfg mock-0.9.14/etc/mock/epel-4-ppc.cfg ---- mock-0.9.14-orig/etc/mock/epel-4-ppc.cfg 2009-02-01 22:00:04.000000000 -0600 -+++ mock-0.9.14/etc/mock/epel-4-ppc.cfg 2009-09-02 12:44:01.000000000 -0500 -@@ -38,9 +38,12 @@ - [testing] - name=epel-testing - mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel4&arch=ppc -+enabled=0 - - [local] - name=local --baseurl=http://buildsys.fedoraproject.org/plague-results/fedora-4-epel/ -+baseurl=http://koji.fedoraproject.org/static-repos/dist-4E-epel-build-current/ppc/ -+cost=2000 -+enabled=0 - - """ -diff -uNr mock-0.9.14-orig/etc/mock/epel-4-x86_64.cfg mock-0.9.14/etc/mock/epel-4-x86_64.cfg ---- mock-0.9.14-orig/etc/mock/epel-4-x86_64.cfg 2009-02-01 22:00:04.000000000 -0600 -+++ mock-0.9.14/etc/mock/epel-4-x86_64.cfg 2009-09-02 12:44:47.000000000 -0500 -@@ -41,11 +41,13 @@ - - [testing] - name=epel-testing -+enabled=0 - mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel4&arch=x86_64 - - [local] - name=local --baseurl=http://buildsys.fedoraproject.org/plague-results/fedora-4-epel/ --exclude=*.i386 *.ppc -+baseurl=http://koji.fedoraproject.org/static-repos/dist-4E-epel-build-current/x86_64/ -+cost=2000 -+enabled=0 - - """ -diff -uNr mock-0.9.14-orig/etc/mock/epel-5-i386.cfg mock-0.9.14/etc/mock/epel-5-i386.cfg ---- mock-0.9.14-orig/etc/mock/epel-5-i386.cfg 2009-02-01 22:00:04.000000000 -0600 -+++ mock-0.9.14/etc/mock/epel-5-i386.cfg 2009-09-02 12:45:21.000000000 -0500 -@@ -34,10 +34,13 @@ - - [testing] - name=epel-testing -+enabled=0 - mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel5&arch=i386 - - [local] - name=local --baseurl=http://buildsys.fedoraproject.org/plague-results/fedora-5-epel/ -+baseurl=http://koji.fedoraproject.org/static-repos/dist-5E-epel-build-current/i386/ -+cost=2000 -+enabled=0 - - """ -diff -uNr mock-0.9.14-orig/etc/mock/epel-5-ppc.cfg mock-0.9.14/etc/mock/epel-5-ppc.cfg ---- mock-0.9.14-orig/etc/mock/epel-5-ppc.cfg 2009-02-01 22:00:04.000000000 -0600 -+++ mock-0.9.14/etc/mock/epel-5-ppc.cfg 2009-09-02 12:45:41.000000000 -0500 -@@ -34,10 +34,13 @@ - - [testing] - name=epel-testing -+enabled=0 - mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel5&arch=ppc - - [local] - name=local --baseurl=http://buildsys.fedoraproject.org/plague-results/fedora-5-epel/ -+baseurl=http://koji.fedoraproject.org/static-repos/dist-5E-epel-build-current/ppc/ -+cost=2000 -+enabled=0 - - """ -diff -uNr mock-0.9.14-orig/etc/mock/epel-5-x86_64.cfg mock-0.9.14/etc/mock/epel-5-x86_64.cfg ---- mock-0.9.14-orig/etc/mock/epel-5-x86_64.cfg 2009-02-01 22:00:04.000000000 -0600 -+++ mock-0.9.14/etc/mock/epel-5-x86_64.cfg 2009-09-02 12:46:11.000000000 -0500 -@@ -37,11 +37,13 @@ - - [testing] - name=epel-testing -+enabled=0 - mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel5&arch=x86_64 - - [local] - name=local --baseurl=http://buildsys.fedoraproject.org/plague-results/fedora-5-epel/ --exclude=*.i386 *.ppc -+baseurl=http://koji.fedoraproject.org/static-repos/dist-5E-epel-build-current/x86_64/ -+cost=2000 -+enabled=0 - - """ diff --git a/mock.spec b/mock.spec index 2ca17ca..88871b5 100644 --- a/mock.spec +++ b/mock.spec @@ -1,7 +1,7 @@ # next four lines substituted by autoconf %define major 1 %define minor 0 -%define sub 5 +%define sub 7 %define extralevel %{nil} %define release_name mock %define release_version %{major}.%{minor}.%{sub}%{extralevel} @@ -19,12 +19,14 @@ URL: http://fedoraproject.org/wiki/Projects/Mock BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: python >= 2.4, yum >= 2.4, tar, gzip, python-ctypes, python-decoratortools, usermode -Requires: createrepo Requires(pre): shadow-utils BuildRequires: python-devel +%if "%{?dist}" == ".el5" +Requires: python-hashlib +%endif %description -Mock takes a srpm and builds it in a chroot +Mock takes an SRPM and builds it in a chroot %prep %setup -q @@ -98,10 +100,20 @@ fi %attr(02775, root, mock) %dir /var/cache/mock %changelog +* Thu Mar 11 2010 Jesse Keating - 1.0.7-1 +- Revert new createrepo feature +- Revert -n/-N useradd change, just use -n as it still works + +* Fri Feb 19 2010 Clark Williams - 1.0.6-1 +- added code to check for SELinux being enabled or disabled + and avoid calling 'chcon' if disabled +- add conditional Require of python-hashlib if building for + the EL5 distro + * Wed Feb 17 2010 Clark Williams - 1.0.5-1 - - from Jesse Keating : - - fixed 'useradd' option conflict with EPEL (-N vs -n) - - added Fedora 13 configs +- from Jesse Keating : + - fixed 'useradd' option conflict with EPEL (-N vs -n) + - added Fedora 13 configs * Wed Feb 10 2010 Clark Williams - 1.0.4-1 - added patch from Seth Vidal to diff --git a/sources b/sources index 11fe8ad..62dc71e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4c869b46720bbfa8fb755d759371d103 mock-1.0.5.tar.gz +b4fe18f9b84b89a34cf8837702f9e8a9 mock-1.0.7.tar.gz