rpms/vnc-ltsp-config/EL-5 vnc-ltsp-config.spec, 1.4, 1.5 vncts.sysconfig, 1.1, 1.2

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/vnc-ltsp-config/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22494

Modified Files:
	vnc-ltsp-config.spec vncts.sysconfig 
Log Message:
* Wed Jan 23 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0-4
- vncts.sysconfig: remove -fp entries, use vnc defaults (#429792)
- License: GPLv2+ 
- %config(noreplace) %_sysconfdir/xinetd.d/vncts
- specfile cosmetics



Index: vnc-ltsp-config.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vnc-ltsp-config/EL-5/vnc-ltsp-config.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- vnc-ltsp-config.spec	6 Apr 2005 22:13:35 -0000	1.4
+++ vnc-ltsp-config.spec	23 Jan 2008 15:01:08 -0000	1.5
@@ -1,12 +1,13 @@
+
 Summary: Easy Enabler of VNC remote LTSP desktops
 Name:	 vnc-ltsp-config
 Version: 4.0
-Release: 3
+Release: 4%{?dist}
 
-License: GPL
+License: GPLv2+ 
 Group: 	 User Interface/X
 BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # VNC terminal service support
 Source0: vncts.xinetd
@@ -21,8 +22,8 @@
 Requires: xinetd
 
 Requires(preun): chkconfig
-Requires(post): perl
-Requires(postun): perl
+Requires(post): coreutils grep
+Requires(postun): sed 
 
 %description
 Easy Enabler of VNC remote LTSP desktops.  This package contains xinetd.d
@@ -35,20 +36,20 @@
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-install -D -p -m644 %{SOURCE0} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/vncts
-install -D -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/vnc/vncts.services
-install -D -p -m755 %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/vncts
-install -D -p -m644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vncts
+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
 
 
 %files
-%defattr(-,root,root)
-%config %{_sysconfdir}/xinetd.d/vncts
-%{_datadir}/vnc/vncts.services
+%defattr(-,root,root,-)
 %{_bindir}/vncts
+%{_datadir}/vnc/vncts.services
 %config(noreplace) %{_sysconfdir}/sysconfig/vncts
+%config(noreplace) %{_sysconfdir}/xinetd.d/vncts
 
 
 %post
@@ -69,9 +70,9 @@
   # 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@@" services
+  #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
@@ -80,10 +81,16 @@
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %changelog
+* Wed Jan 23 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0-4
+- vncts.sysconfig: remove -fp entries, use vnc defaults (#429792)
+- License: GPLv2+ 
+- %%config(noreplace) %%_sysconfdir/xinetd.d/vncts
+- specfile cosmetics
+
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 


Index: vncts.sysconfig
===================================================================
RCS file: /cvs/pkgs/rpms/vnc-ltsp-config/EL-5/vncts.sysconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vncts.sysconfig	8 Nov 2004 05:31:22 -0000	1.1
+++ vncts.sysconfig	23 Jan 2008 15:01:08 -0000	1.2
@@ -4,5 +4,5 @@
 XVNC=/usr/bin/Xvnc
 
 # Default options to use
-VNCTSOPTIONS="-inetd -once -query localhost -fp unix/:7100 -SecurityTypes None"
+VNCTSOPTIONS="-inetd -once -query localhost -SecurityTypes None"