From 6032020bc49c47592f5e1f7190fde1f563f35a0e Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mar 11 2010 23:10:51 +0000 Subject: Import upstream build to revert new features --- diff --git a/.cvsignore b/.cvsignore index 3690f14..4d2dfda 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -mock-1.0.6.tar.gz +mock-1.0.7.tar.gz diff --git a/import.log b/import.log index 1373d77..d23342f 100644 --- a/import.log +++ b/import.log @@ -1,3 +1,4 @@ mock-0_9_16-1_fc11:F-11:mock-0.9.16-1.fc11.src.rpm:1242093788 mock-0_9_18-1_fc13:F-11:mock-0.9.18-1.fc13.src.rpm:1257440123 mock-0_9_19-1_fc12:F-11:mock-0.9.19-1.fc12.src.rpm:1257445434 +mock-1_0_7-1_el5:F-11:mock-1.0.7-1.el5.src.rpm:1268348999 diff --git a/mock.spec b/mock.spec index b4765ae..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 6 +%define sub 7 %define extralevel %{nil} %define release_name mock %define release_version %{major}.%{minor}.%{sub}%{extralevel} @@ -19,7 +19,6 @@ 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" @@ -101,6 +100,10 @@ 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 diff --git a/sources b/sources index 575d0d2..62dc71e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -47039cbd3aef6d3807d035a5f834edce mock-1.0.6.tar.gz +b4fe18f9b84b89a34cf8837702f9e8a9 mock-1.0.7.tar.gz