[mock] mounts: do not mount /dev/shm or /dev/pts if internal setup false

[John Clark Williams]

commit b1d59827cfd3aadac4ef136f057665d452857a3d
Author: Clark Williams <clark.williams at gmail.com>
Date:   Fri Jan 23 14:25:26 2015 -0600

    mounts: do not mount /dev/shm or /dev/pts if internal setup false
    
    - actually package compress_logs plugin
    - use relative imports
    - touch /etc/os-release after install @buildsys-build [RHBZ#1183454]
    - parse /etc/os-release only if it exists and size is non-zero [RHBZ#1183454]

 .gitignore |    1 +
 mock.spec  |   17 ++++++++++++-----
 sources    |    2 +-
 3 files changed, 14 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index eff5e09..e5af4d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,3 +44,4 @@ mock-1.1.4.tar.gz
 /mock-1.2.2.tar.xz
 /mock-1.2.3.tar.xz
 /mock-1.2.4.tar.xz
+/mock-1.2.5.tar.xz
diff --git a/mock.spec b/mock.spec
index b6dceb7..6e6988f 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 4
+%define sub 5
 %define extralevel %{nil}
 %define release_version %{major}.%{minor}.%{sub}%{extralevel}
 
@@ -95,7 +95,7 @@ of the buildroot.
 %prep
 %setup -q
 %if 0%{?rhel} == 6
-sed -i "s|^USE_NSPAWN = True|USE_NSPAWN = False|" py/mockbuild/util.py 
+sed -i "s|^USE_NSPAWN = True|USE_NSPAWN = False|" py/mockbuild/util.py
 %endif
 %if %{use_python3}
 sed -i 's/AM_PATH_PYTHON/AM_PATH_PYTHON([3])/' configure.ac
@@ -108,8 +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
+sed -i '1,$s/1.2.5/%{version}/' docs/mock.1
+sed -i '1,$s/1.2.5/%{version}/' docs/mockchain.1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -148,7 +148,7 @@ exit 0
 # fix cache permissions from old installs
 chmod 2775 %{_localstatedir}/cache/%{name}
 
-if [ -e /etc/os-release ]; then
+if [ -s /etc/os-release ]; then
     # fedora and rhel7
     if grep -Fq Rawhide /etc/os-release; then
         ver=rawhide
@@ -210,6 +210,13 @@ fi
 %endif
 
 %changelog
+* Fri Jan 23 2015 Clark Williams <williams at redhat.com> - 1.2.5-1
+- mounts: do not mount /dev/shm or /dev/pts if internal setup false
+- actually package compress_logs plugin
+- use relative imports
+- touch /etc/os-release after install @buildsys-build [RHBZ#1183454]
+- parse /etc/os-release only if it exists and size is non-zero [RHBZ#1183454]
+
 * Fri Jan 16 2015 Miroslav Suchý <msuchy at redhat.com> - 1.2.4-1
 - each user have its own ccache cache [RHBZ#1168116]
 - man: write example for --chroot option
diff --git a/sources b/sources
index a87ab2b..4b6888c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c746aa5d982459e633b0a7723888f10b  mock-1.2.4.tar.xz
+2d8d1200d850d082929e2863d7d4c54e  mock-1.2.5.tar.xz