[mock: 1/2] from Miroslav Suchý <msuchy at redhat.com>:

[John Clark Williams]

commit f3eaee2ebcaf3c96a6b460440dd2d7c747b29693
Author: Clark Williams <clark.williams at gmail.com>
Date:   Thu Jul 17 16:10:18 2014 -0500

    from Miroslav Suchý <msuchy at redhat.com>:
    
      - mock: Revert "revert 7ec6a1e9d202ab56fb31c914dbf7516c045e56ab" [BZ# 1103239]
      - configs: use final Centos 7 path in configs [BZ# 1108402]
      - configs: fix typo in fedora-rawhide-armhfp config [BZ# 1108847]
      - mockchain: use getuid() instead of getgid() [BZ# 1108265]
      - configs: check gpg key of packages from Fedora, Centos, Epel
      - plugins: disable package_state by default on el6
      - make /etc/mtab symlink to /proc/self/mounts [BZ# 1116158]
      - do not list pki files twice
      - deploy etc/pki to buildroot
    - from Michael Simacek <msimacek at redhat.com>:
      - mock: do not allow config scripts to regain root priviledges
    - from Igor Gnatenko <i.gnatenko.brain at gmail.com>:
      - Add F21 configs
      - Change releasever to 22 for rawhide

 .gitignore |    1 +
 mock.spec  |   32 +++++++++++++++++++++++++++++++-
 sources    |    2 +-
 3 files changed, 33 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 02f0a4a..ca5f7ad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,4 @@ mock-1.1.4.tar.gz
 /mock-1.1.37.tar.xz
 /mock-1.1.38.tar.xz
 /mock-1.1.39.tar.xz
+/mock-1.1.40.tar.xz
diff --git a/mock.spec b/mock.spec
index 759036e..c39c92f 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 39
+%define sub 40
 %define extralevel %{nil}
 %define release_name mock
 %define release_version %{major}.%{minor}.%{sub}%{extralevel}
@@ -83,6 +83,15 @@ 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
+%endif
+
 %pre
 
 # check for existence of mock group, create it if not found
@@ -130,6 +139,10 @@ ln -s -f $cfg %{_sysconfdir}/%{name}/default.cfg
 %config(noreplace) %{_sysconfdir}/pam.d/%{name}
 %config(noreplace) %{_sysconfdir}/security/console.apps/%{name}
 
+# gpg keys
+%dir %{_sysconfdir}/pki/mock
+%config(noreplace) %{_sysconfdir}/pki/mock/*
+
 # docs
 %{_mandir}/man1/mock.1*
 %{_mandir}/man1/mockchain.1*
@@ -144,6 +157,23 @@ 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
+- from Miroslav Suchý <msuchy at redhat.com>:
+  - mock: Revert "revert 7ec6a1e9d202ab56fb31c914dbf7516c045e56ab" [BZ# 1103239]
+  - configs: use final Centos 7 path in configs [BZ# 1108402]
+  - configs: fix typo in fedora-rawhide-armhfp config [BZ# 1108847]
+  - mockchain: use getuid() instead of getgid() [BZ# 1108265]
+  - configs: check gpg key of packages from Fedora, Centos, Epel
+  - plugins: disable package_state by default on el6
+  - make /etc/mtab symlink to /proc/self/mounts [BZ# 1116158]
+  - do not list pki files twice
+  - deploy etc/pki to buildroot
+- from Michael Simacek <msimacek at redhat.com>:
+  - mock: do not allow config scripts to regain root priviledges
+- from Igor Gnatenko <i.gnatenko.brain at gmail.com>:
+  - Add F21 configs
+  - Change releasever to 22 for rawhide
+
 * 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 844bb7e..2370ee4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-118e9e4266ca4c72537bd92191fb2a11  mock-1.1.39.tar.xz
+11c9d63d6f862b260dcbf68405338c85  mock-1.1.40.tar.xz