[mock] fix python 2.7 feature so we can run on rhel6
John Clark Williams
jcwillia at fedoraproject.org
Fri Jul 18 17:29:53 UTC 2014
commit ed02f4439be8709f254b1eee3e55521c9e5eec12
Author: Clark Williams <clark.williams at gmail.com>
Date: Fri Jul 18 12:30:13 2014 -0500
fix python 2.7 feature so we can run on rhel6
.gitignore | 1 +
mock.spec | 16 ++++++----------
sources | 2 +-
3 files changed, 8 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ca5f7ad..54b9139 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,4 @@ mock-1.1.4.tar.gz
/mock-1.1.38.tar.xz
/mock-1.1.39.tar.xz
/mock-1.1.40.tar.xz
+/mock-1.1.41.tar.xz
diff --git a/mock.spec b/mock.spec
index e732835..4b39ed9 100644
--- a/mock.spec
+++ b/mock.spec
@@ -1,7 +1,7 @@
# next four lines substituted by autoconf
%define major 1
%define minor 1
-%define sub 40
+%define sub 41
%define extralevel %{nil}
%define release_name mock
%define release_version %{major}.%{minor}.%{sub}%{extralevel}
@@ -14,7 +14,7 @@
Summary: Builds packages inside chroots
Name: mock
Version: %{release_version}
-Release: 2%{?dist}
+Release: 1%{?dist}
License: GPLv2+
Group: Development/Tools
Source: https://git.fedorahosted.org/cgit/mock.git/snapshot/%{name}-%{version}.tar.xz
@@ -83,10 +83,6 @@ elif [ -d $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d ]; then
echo %{_sysconfdir}/bash_completion.d/mock >> %{name}.cfgs
fi
-#[ -d ${RPM_BUILD_ROOT}%{_sysconfdir}/pki/mock ] || mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/pki/mock
-#echo ${RPM_BUILD_ROOT}%{_sysconfdir}/pki/mock >> %{name}.cfgs
-#cp -r etc/pki/* ${RPM_BUILD_ROOT}%{_sysconfdir}/pki/mock
-
%if 0%{?rhel} == 6
# can be removed when yum-utils >= 1.1.31 lands in el6
echo "config_opts['plugin_conf']['package_state_enable'] = False" >> $RPM_BUILD_ROOT%{_sysconfdir}/mock/site-defaults.cfg
@@ -157,7 +153,10 @@ ln -s -f $cfg %{_sysconfdir}/%{name}/default.cfg
%{python_sitelib}/mockbuild/scm.py*
%changelog
-* Thu Jul 10 2014 Clark Williams <williams at redhat.com> - 1.1.40-1
+* Fri Jul 18 2014 Clark Williams <williams at redhat.com> - 1.1.41-1
+- fix python 2.7 feature so we can run on rhel6
+
+* Thu Jul 17 2014 Clark Williams <williams at redhat.com> - 1.1.40-1
- from Miroslav Suchý <msuchy at redhat.com>:
- mock: Revert "revert 7ec6a1e9d202ab56fb31c914dbf7516c045e56ab" [BZ# 1103239]
- configs: use final Centos 7 path in configs [BZ# 1108402]
@@ -174,9 +173,6 @@ ln -s -f $cfg %{_sysconfdir}/%{name}/default.cfg
- Add F21 configs
- Change releasever to 22 for rawhide
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.39-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
* Wed May 21 2014 Clark Williams <williams at redhat.com> - 1.1.39-1
- configs: update epel-7 koji repo to use correct URL
- from Ken Dreyer <ktdryer at ktdryder.com>
diff --git a/sources b/sources
index 2370ee4..b85f26e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-11c9d63d6f862b260dcbf68405338c85 mock-1.1.40.tar.xz
+c846bc74a4227a567d85579d7ae3406a mock-1.1.41.tar.xz
More information about the scm-commits
mailing list