rpms/system-config-display/devel scd-2.2-preexec-fn.patch, NONE, 1.1 system-config-display.spec, 1.72, 1.73

[Adam Jackson]

Author: ajax

Update of /cvs/pkgs/rpms/system-config-display/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv25367

Modified Files:
	system-config-display.spec 
Added Files:
	scd-2.2-preexec-fn.patch 
Log Message:
* Tue Jul 27 2010 Adam Jackson <ajax at redhat.com> 2.2-3
- scd-2.2-preexec-fn.patch: Remove bizarre chroot handling.


scd-2.2-preexec-fn.patch:
 xserver.py |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

--- NEW FILE scd-2.2-preexec-fn.patch ---
diff -up system-config-display-2.2/src/xserver.py.jx system-config-display-2.2/src/xserver.py
--- system-config-display-2.2/src/xserver.py.jx	2009-09-21 13:21:10.000000000 -0400
+++ system-config-display-2.2/src/xserver.py	2010-07-27 15:24:58.000000000 -0400
@@ -135,11 +135,6 @@ class XServer:
             return (True, END)
 
     def _run(self, xStartedCB = None):
-        def chroot():
-            if self.root != "/":
-                os.chroot(self.root)
-                os.chdir("/")
-
         args = ['-logfile', self.logfile, self.display] + self.serverflags
 
         if self.hwstate.videocard == None:
@@ -160,7 +155,7 @@ class XServer:
 
 	    old_sigusr1 = signal.signal(signal.SIGUSR1, sigusr1_handler)
 	    old_sigchld = signal.signal(signal.SIGCHLD, sigchld_handler)
-            proc = subprocess.Popen(["/usr/bin/Xorg"] + args, preexec_fn=chroot,
+            proc = subprocess.Popen(["/usr/bin/Xorg"] + args,
                                     stdout=noOutput, stderr=noOutput,
 				    preexec_fn=preexec_fn)
 	    signal.pause()


Index: system-config-display.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-display/devel/system-config-display.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- system-config-display.spec	22 Jul 2010 06:48:31 -0000	1.72
+++ system-config-display.spec	27 Jul 2010 19:26:29 -0000	1.73
@@ -3,7 +3,7 @@
 Summary: A graphical interface for configuring the X Window System display
 Name: system-config-display
 Version: 2.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/Tools
 License: GPLv2+
 ExclusiveOS: Linux
@@ -14,6 +14,7 @@ Provides: rhpxl = 1.12-4.fc12
 Obsoletes: rhpxl < 1.12-4.fc12
 
 Source0: http://fedorahosted.org/releases/s/y/%{name}/%{name}-%{version}.tar.bz2
+Patch0: scd-2.2-preexec-fn.patch
 
 ExcludeArch: s390 s390x
 BuildRequires: desktop-file-utils
@@ -39,6 +40,7 @@ X Window System X server display.
 
 %prep
 %setup -q
+%patch0 -p1 -b .py27
 
 %build
 make
@@ -83,6 +85,9 @@ fi
 %{python_sitearch}/_pyrandr*
 
 %changelog
+* Tue Jul 27 2010 Adam Jackson <ajax at redhat.com> 2.2-3
+- scd-2.2-preexec-fn.patch: Remove bizarre chroot handling.
+
 * Thu Jul 22 2010 David Malcolm <dmalcolm at redhat.com> - 2.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild