From 25cbeb96218305be138c14a6209de52324bcc03f Mon Sep 17 00:00:00 2001
From: Miroslav Suchý <msuchy@redhat.com>
Date: Jan 16 2015 09:12:20 +0000
Subject: import mock-1.2.4 from upstream


---

diff --git a/.gitignore b/.gitignore
index 52afde2..eff5e09 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,3 +43,4 @@ mock-1.1.4.tar.gz
 /mock-1.2.1.tar.xz
 /mock-1.2.2.tar.xz
 /mock-1.2.3.tar.xz
+/mock-1.2.4.tar.xz
diff --git a/mock.spec b/mock.spec
index 9a1ac59..b6dceb7 100644
--- a/mock.spec
+++ b/mock.spec
@@ -1,7 +1,7 @@
 # next four lines substituted by autoconf
 %define major 1
 %define minor 2
-%define sub 3
+%define sub 4
 %define extralevel %{nil}
 %define release_version %{major}.%{minor}.%{sub}%{extralevel}
 
@@ -108,6 +108,8 @@ done
 autoreconf -vif
 %configure
 make
+sed -i '1,$s/1.2.4/%{version}/' docs/mock.1
+sed -i '1,$s/1.2.4/%{version}/' docs/mockchain.1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -208,6 +210,37 @@ fi
 %endif
 
 %changelog
+* Fri Jan 16 2015 Miroslav Suchý <msuchy@redhat.com> - 1.2.4-1
+- each user have its own ccache cache [RHBZ#1168116]
+- man: write example for --chroot option
+- sort options in man page
+- sort command in man page
+- add Fedora 22 GPG keys
+- improve --resultdir part of man page [RHBZ#1181554]
+- allow the subsitution of resultdir into the yum.conf block [RHBZ#1125376]
+- do no print duplicities in bash completion
+- Fixed systemd-nspawn machine name collision [RHBZ#1174286]
+- do shell expansion on  --new-chroot --chroot [RHBZ#1174317]
+- log executing command after nspawn expansion
+- make sure that mockchain generate unique repoid for all repos [RHBZ#1179806]
+- workaround old python-six in EL7
+- Remove checking for chroot existence in --chroot
+- Exclude .bash_history and .bashrc from builddir cleanup
+- Ignore broken symlinks in chown_home_dir
+- create SCM files as non-privileg user [RHBZ#1178576]
+- With --no-clean, delete /builddir except build/SOURCES [RHBZ#1173126]
+- Man page formatting improvements
+- Move the pool size check to later time when pool already exists
+- Always use returnOutput in lvm plugin to get possible error output
+- put correct version in man page
+- Fix unicode characters in logs on Python 2 [RHBZ#1171707]
+- Added new option 'postinstall' [RHBZ#1168911]
+- Use keepcache=1 in yum.conf [RHBZ#1169126]
+- Warn user when LVM thin pool is filled up [RHBZ#1167761]
+- add missing max_metadata_age_days do site-defaults.cfg
+- add age_check to site-default.cfg
+- compress also logs created by package_state plugin
+
 * Thu Dec  4 2014 Miroslav Suchý <msuchy@redhat.com> - 1.2.3-1
 - fixed incorrect command construction in PackageManager:build_invocation [RHBZ#1170230]
 - completion: correctly expand --install [RHBZ#1168220]
@@ -253,7 +286,7 @@ fi
 - Install into correct sitelib when using Python 3
 - Fix nosync on aarch64
 - wrap all remaining getcwd() [RHBZ#1159300]
-- do not use rpm in %post scriptlet [RHBZ#1131279]
+- do not use rpm in %%post scriptlet [RHBZ#1131279]
 - Fix unclear legal host output [RHBZ#1159794]
 - allow running from directory, which is deleted [RHBZ#1159300]
 - create compress_logs plugin [RHBZ#1100923]
@@ -319,10 +352,10 @@ from Miroslav Suchý <msuchy@redhat.com>
   - set LC_MESSAGE to C before executing command [BZ# 519258]
   - use ctypes.get_errno() instead of ctypes.c_int.in_dll(_libc, "errno")
   - revert 7ec6a1e9d202ab56fb31c914dbf7516c045e56ab (python 2.4 workarounds)
-  - buildroot and %clean is not needed for el6 and fedoras
+  - buildroot and %%clean is not needed for el6 and fedoras
   - description should always end with dot
   - remove shebang from mockbuild/mounts.py
-  - %defattr is not needed since rpm 4.4
+  - %%defattr is not needed since rpm 4.4
   - remove el5 conditional
   - use createrepo_c which is much faster
   - whitespace fixes
diff --git a/sources b/sources
index 04ec7f5..a87ab2b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bededb824605be88cfdcc825ebf8ce1e  mock-1.2.3.tar.xz
+c746aa5d982459e633b0a7723888f10b  mock-1.2.4.tar.xz