From a898638e0ac2130b2394d9cec4dabd2a0f98e91b Mon Sep 17 00:00:00 2001
From: Daniel Williams <dcbw@fedoraproject.org>
Date: Jan 24 2006 17:16:33 +0000
Subject: - Back out setpgrp patch, found a better way to do it in plague


---

diff --git a/mock-0.4-setpgrp.patch b/mock-0.4-setpgrp.patch
deleted file mode 100644
index 0200821..0000000
--- a/mock-0.4-setpgrp.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- mock-0.4/mock.py.setpgrp	2006-01-24 11:10:40.000000000 -0500
-+++ mock-0.4/mock.py	2006-01-24 11:12:08.000000000 -0500
-@@ -621,6 +621,8 @@
-             help="path for state dirresulting files to be put")
-     parser.add_option("--uniqueext", action="store", type="string", default=None,
-             help="Arbitrary, unique extension to append to buildroot directory name")
-+    parser.add_option("--setpgrp", action ="store_true", dest="setpgrp", 
-+            default=False, help="starts a new process group for mock")
- 
-     return parser.parse_args()
-     
-@@ -683,7 +685,12 @@
-     if len(args) < 1:
-         error("No srpm or command specified - nothing to do")
-         sys.exit(50)
--    
-+
-+    # If requested, become a process group leader so that us and
-+    # _all_ of our children can more easily be killed with kill(2)
-+    if options.setpgrp:
-+        os.setpgrp()
-+
-     # read in the config file by chroot name
-     if options.chroot.endswith('.cfg'):
-         cfg = '%s/%s' % (config_path, options.chroot)
diff --git a/mock.spec b/mock.spec
index 1a9f00b..083f843 100644
--- a/mock.spec
+++ b/mock.spec
@@ -1,7 +1,7 @@
 Summary: Builds packages inside chroots
 Name: mock
 Version: 0.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://fedoraproject.org/projects/mock/releases/%{name}-%{version}.tar.gz
@@ -11,7 +11,6 @@ Requires: python, yum >= 2.2.1
 Requires(pre): shadow-utils
 BuildRequires: libselinux-devel
 Patch0: mock-0.4-unpackaged-files-fix.patch
-Patch1: mock-0.4-setpgrp.patch
 
 %description
 Mock takes a srpm and builds it in a chroot
@@ -20,7 +19,6 @@ Mock takes a srpm and builds it in a chroot
 %setup -q
 
 %patch0 -p1 -b .unpackaged-files-fix
-%patch1 -p1 -b .setpgrp
 
 %build
 make
@@ -70,6 +68,9 @@ fi
 
 
 %changelog
+* Tue Jan 24 2006 Dan Williams <dcbw@redhat.com> - 0.4-5
+- Back out setpgrp patch, found a better way to do it in plague
+
 * Tue Jan 24 2006 Dan Williams <dcbw@redhat.com> - 0.4-4
 - Add option to create new process group so mock and its children
     may be more easily killed