rpms/vnc/devel vnc.spec,1.123,1.124 vncserver.init,1.9,1.10

[fedora-cvs-commits at redhat.com]

Author: twaugh

Update of /cvs/dist/rpms/vnc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20072

Modified Files:
	vnc.spec vncserver.init 
Log Message:
* Tue Jan  3 2006 Tim Waugh <twaugh at redhat.com>
- Prevent restorecon error message when not present (bug #176654).



Index: vnc.spec
===================================================================
RCS file: /cvs/dist/rpms/vnc/devel/vnc.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- vnc.spec	23 Dec 2005 10:24:04 -0000	1.123
+++ vnc.spec	3 Jan 2006 13:13:40 -0000	1.124
@@ -256,6 +256,9 @@
 %{_libdir}/xorg/modules/extensions/libvnc.so
 
 %changelog
+* Tue Jan  3 2006 Tim Waugh <twaugh at redhat.com>
+- Prevent restorecon error message when not present (bug #176654).
+
 * Fri Dec 23 2005 Tim Waugh <twaugh at redhat.com> 4.1.1-32
 - Use system libtool to fix libvnc.so build (bug #176435).
 


Index: vncserver.init
===================================================================
RCS file: /cvs/dist/rpms/vnc/devel/vncserver.init,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- vncserver.init	5 Jan 2005 15:19:08 -0000	1.9
+++ vncserver.init	3 Jan 2006 13:13:40 -0000	1.10
@@ -26,7 +26,7 @@
     if [ ! -d /tmp/.X11-unix ]
     then
         mkdir -m 1777 /tmp/.X11-unix || :
-        restorecon /tmp/.X11-unix || :
+        restorecon /tmp/.X11-unix 2>/dev/null || :
     fi
     for display in ${VNCSERVERS}
     do