[mock] removed f16 configurations files

[John Clark Williams]

commit fbf2e296f0ce84dbbbed46f9bfe8d3f02980ae3d
Author: Clark Williams <clark.williams at gmail.com>
Date:   Tue Apr 16 11:59:36 2013 -0500

    removed f16 configurations files
    
    - selinux plugin: modify to catch yum-builddep in callback [BZ# 923927]
    - fix logging assumption in main mock file [BZ# 912624]
    - initial cut at chroot_scan plugin [BZ# 441090]
    - updated specfile to use static mock gid 135
    - from Marko Myllynen <myllynen at redhat.com>:
      - separate scm module into separate package [BZ# 798367]
      - scm plugin: Handle filenames w/ spaces in SCM/git  [BZ# 915264]
      - scm plugin: if tar supports --exlcude-vcs use it [BZ#  824848]
    - from Shad L. Lords <slords at lordsfam.net>:
      - mounts plugin: removed redundant '-t' specified for vfstype [BZ# 910857]
    - from Justin Lewis Salmon <jsalmon at cern.ch>:
      - root cache plugin: add the --cache-alternations option [BZ# 905363]

 .gitignore |    1 +
 mock.spec  |   47 +++++++++++++++++++++++++++++++++++++++++------
 sources    |    2 +-
 3 files changed, 43 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4ee60e1..9179f8c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,4 @@ mock-1.1.4.tar.gz
 /mock-1.1.28.tar.gz
 /mock-1.1.29.tar.gz
 /mock-1.1.30.tar.gz
+/mock-1.1.31.tar.gz
diff --git a/mock.spec b/mock.spec
index 1127a54..d09c017 100644
--- a/mock.spec
+++ b/mock.spec
@@ -1,13 +1,16 @@
 # next four lines substituted by autoconf
 %define major 1
 %define minor 1
-%define sub 30
+%define sub 31
 %define extralevel %{nil}
 %define release_name mock
 %define release_version %{major}.%{minor}.%{sub}%{extralevel}
 
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
+# mock group id allocate for Fedora
+%global mockgid  135
+
 Summary: Builds packages inside chroots
 Name: mock
 Version: %{release_version}
@@ -30,6 +33,14 @@ Requires: python-hashlib
 %description
 Mock takes an SRPM and builds it in a chroot
 
+%package scm
+Group: Development/Tools
+Summary: Mock SCM integration module
+Requires: mock = %{version}-%{release}, cvs, git, subversion, tar
+
+%description scm
+Mock SCM integration module
+
 %prep
 %setup -q
 
@@ -67,11 +78,17 @@ ln -s fedora-rawhide-x86_64.cfg $RPM_BUILD_ROOT%{_sysconfdir}/mock/default.cfg
 rm -rf $RPM_BUILD_ROOT
 
 %pre
-if [ $1 -eq 1 ]; then
-    groupadd -r mock >/dev/null 2>&1 || :
-fi
+
+# check for existence of mock group, create it if not found
+getent groupname mock > /dev/null || groupadd -f -g %mockgid -r mock
+exit 0
 
 %post
+
+# fix cache permissions from old installs
+chmod 2775 /var/cache/mock
+
+# setup default configuration
 # TODO: use dist and version of install system, not build one
 if [ ! -e %{_sysconfdir}/%{name}/default.cfg ] ; then
     # in case of dangling symlink
@@ -85,8 +102,6 @@ if [ ! -e %{_sysconfdir}/%{name}/default.cfg ] ; then
         fi
     done
 fi
-# fix cache permissions from old installs
-chmod 2775 /var/cache/mock
 :
 
 %files -f %{name}.cfgs
@@ -99,6 +114,7 @@ chmod 2775 /var/cache/mock
 
 # python stuff
 %{python_sitelib}/*
+%exclude %{python_sitelib}/mockbuild/scm.*
 
 # config files
 %dir  %{_sysconfdir}/%{name}
@@ -117,8 +133,27 @@ chmod 2775 /var/cache/mock
 %defattr(0775, root, mock, 02775)
 %dir /var/cache/mock
 %dir /var/lib/mock
+
+%files scm
+%defattr(-, root, root)
+%{python_sitelib}/mockbuild/scm.py*
  
 %changelog
+* Fri Apr 12 2013 Clark Williams <williams at redhat.com> - 1.1.31-1
+- removed f16 configurations files
+- selinux plugin: modify to catch yum-builddep in callback [BZ# 923927]
+- fix logging assumption in main mock file [BZ# 912624]
+- initial cut at chroot_scan plugin [BZ# 441090]
+- updated specfile to use static mock gid 135
+- from Marko Myllynen <myllynen at redhat.com>:
+  - separate scm module into separate package [BZ# 798367]
+  - scm plugin: Handle filenames w/ spaces in SCM/git  [BZ# 915264]
+  - scm plugin: if tar supports --exlcude-vcs use it [BZ#  824848]
+- from Shad L. Lords <slords at lordsfam.net>:
+  - mounts plugin: removed redundant '-t' specified for vfstype [BZ# 910857]
+- from Justin Lewis Salmon <jsalmon at cern.ch>:
+  - root cache plugin: add the --cache-alternations option [BZ# 905363]
+
 * Thu Mar 28 2013 Clark Williams <williams at redhat.com> - 1.1.30-1
 - beef up the logic to remove RPM lock files inside the chroot
 - add backup-before-clean configuration options [BZ# 799639]
diff --git a/sources b/sources
index 0274643..c31745d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-630eb524c9a40acc477f39ad0cce0430  mock-1.1.30.tar.gz
+162e5fbf784e7551936153d47cd3bfea  mock-1.1.31.tar.gz