rpms/vnc-ltsp-config/devel vnc-ltsp-config.spec, 1.5, 1.6 vncts.xinetd, 1.1, 1.2

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/vnc-ltsp-config/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10916

Modified Files:
	vnc-ltsp-config.spec vncts.xinetd 
Log Message:
* Mon Feb 18 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0-5
- omit /etc/services munging (#431628)



Index: vnc-ltsp-config.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vnc-ltsp-config/devel/vnc-ltsp-config.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- vnc-ltsp-config.spec	23 Jan 2008 14:51:25 -0000	1.5
+++ vnc-ltsp-config.spec	18 Feb 2008 14:47:30 -0000	1.6
@@ -2,7 +2,7 @@
 Summary: Easy Enabler of VNC remote LTSP desktops
 Name:	 vnc-ltsp-config
 Version: 4.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 License: GPLv2+ 
 Group: 	 User Interface/X
@@ -11,8 +11,6 @@
 
 # VNC terminal service support
 Source0: vncts.xinetd
-# /etc/services entries
-Source1: vncts.services
 # Xvnc wrapper
 Source2: vncts.sh
 # Xvnc default options
@@ -22,8 +20,6 @@
 Requires: xinetd
 
 Requires(preun): chkconfig
-Requires(post): coreutils grep
-Requires(postun): sed 
 
 %description
 Easy Enabler of VNC remote LTSP desktops.  This package contains xinetd.d
@@ -39,7 +35,6 @@
 rm -rf %{buildroot}
 
 install -D -p -m644 %{SOURCE0} %{buildroot}%{_sysconfdir}/xinetd.d/vncts
-install -D -p -m644 %{SOURCE1} %{buildroot}%{_datadir}/vnc/vncts.services
 install -D -p -m755 %{SOURCE2} %{buildroot}%{_bindir}/vncts
 install -D -p -m644 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/vncts
 
@@ -47,37 +42,18 @@
 %files
 %defattr(-,root,root,-)
 %{_bindir}/vncts
-%{_datadir}/vnc/vncts.services
 %config(noreplace) %{_sysconfdir}/sysconfig/vncts
 %config(noreplace) %{_sysconfdir}/xinetd.d/vncts
 
 
-%post
-if [ ! "`grep ^vnc-1024x768x16 %{_sysconfdir}/services`" ]; then
-  cat %{_datadir}/vnc/vncts.services >> %{_sysconfdir}/services ||:
-fi
-
 %preun
 if [ $1 -eq 0 ]; then
-  # turn off now, to avoid running in middle of uninstall
   /sbin/chkconfig vncts off ||:
 fi
 
 %postun
-if [ $1 -eq 0 ]; then
-  ## cleanup services
-  # method1: grep
-  # grep -v -e '^vnc-............59../tcp' %{_sysconfdir}/services > %{_sysconfdir}/services.%{name} && \
-  #mv -f %{_sysconfdir}/services.%{name} %{_sysconfdir}/services
-  # method2: perl
-  #perl -ni -e 'print if ! /^vnc-............59..\/tcp/' %{_sysconfdir}/services ||:
-  # method3: sed 
-  sed -i -e "s|^vnc-............59..\/tcp||" %{_sysconfdir}/services
-  exit 0
-else
-  # Make sure xinetd picks up changes
-  /sbin/service xinetd reload >/dev/null 2>&1 ||:
-fi
+# Make sure xinetd picks up changes
+/sbin/service xinetd reload >/dev/null 2>&1 ||:
 
 
 %clean
@@ -85,6 +61,9 @@
 
 
 %changelog
+* Mon Feb 18 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0-5
+- omit /etc/services munging (#431628)
+
 * Wed Jan 23 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0-4
 - vncts.sysconfig: remove -fp entries, use vnc defaults (#429792)
 - License: GPLv2+ 


Index: vncts.xinetd
===================================================================
RCS file: /cvs/pkgs/rpms/vnc-ltsp-config/devel/vncts.xinetd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vncts.xinetd	8 Nov 2004 05:31:22 -0000	1.1
+++ vncts.xinetd	18 Feb 2008 14:47:30 -0000	1.2
@@ -7,6 +7,8 @@
 service vnc-1024x768x16
 {
 	disable		= yes	
+	type		= UNLISTED
+	port		= 5900
 	socket_type	= stream        
 	wait		= no
 	user		= nobody 
@@ -18,6 +20,8 @@
 service vnc-800x600x16
 {
 	disable		= yes	
+	type		= UNLISTED
+	port		= 5901
         socket_type     = stream
         wait            = no
         user            = nobody
@@ -28,7 +32,9 @@
 
 service vnc-640x480x16
 {
-	disable	= no
+	disable		= yes
+	type		= UNLISTED
+ 	port		= 5902
         socket_type     = stream
         wait            = no
         user            = nobody
@@ -39,7 +45,9 @@
 
 service vnc-1024x768x8
 {
-	disable	= no
+	disable		= yes 
+	type		= UNLISTED
+	port		= 5903
         socket_type     = stream
         wait            = no
         user            = nobody
@@ -51,6 +59,8 @@
 service vnc-800x600x8
 {
 	disable		= yes 
+	type		= UNLISTED
+	port		= 5904
         socket_type     = stream
         wait            = no
         user            = nobody
@@ -62,6 +72,8 @@
 service vnc-640x480x8
 {
 	disable		= yes
+	type		= UNLISTED
+	port		= 5905
         socket_type     = stream
         wait            = no
         user            = nobody