[ltsp/el6] Prep for stable release, mock changes, enabled nbd and fixed misc bugs.

[Joshua Trimm]

commit e79c45614434d81819665d3c11e5c4646afc627e
Author: Joshua Trimm <enslaver at enslaver.com>
Date:   Sun Apr 28 11:01:48 2013 -0500

    Prep for stable release, mock changes, enabled nbd and fixed misc bugs.

 ltsp.spec |   50 ++++++++++++++++++++++++++------------------------
 sources   |    2 +-
 2 files changed, 27 insertions(+), 25 deletions(-)
---
diff --git a/ltsp.spec b/ltsp.spec
index e2a8cc6..5e2958a 100644
--- a/ltsp.spec
+++ b/ltsp.spec
@@ -1,8 +1,8 @@
 Name:           ltsp
 Version:        5.4.5
-%define _datestamp .20130408.10
-#Release:       16%{_datestamp}%{?dist}
-Release:        17%{?dist}
+%define _datestamp .20130428.07
+#Release:        20%{_datestamp}%{?dist}
+Release:        20%{?dist}
 Summary:        Linux Terminal Server Project Server and Client
 Group:          User Interface/Desktops
 
@@ -56,7 +56,7 @@ This package contains the scripts necessary to boot as a LTSP5 thin client.
 %package server
 Summary:        LTSP server
 Group:          User Interface/Desktops
-Requires:	mock >= 1
+Requires:       mock >= 1
 Requires:       nfs-utils
 Requires:       tftp-server
 Requires:       ltspfs
@@ -64,13 +64,14 @@ Requires:       dhcp
 Requires:       gettext
 Requires:       xinetd
 Requires:       bridge-utils
-Requires:	ldm >= 2.2.11
+Requires:       ldm >= 2.2.11
 Requires:       ldminfod >= 2.2.11
-Requires:	lsb
+Requires:       lsb
 Requires:       fuse fuse-libs fuse-devel
 Requires:       xorg-x11-xdm
-Requires:	dialog
-#Requires:	dnsmasq
+Requires:       dialog
+#Requires:      dnsmasq
+Requires:       squashfs-tools
 Requires(post): chkconfig
 Requires(preun): chkconfig
 Obsoletes:      ltsp-vmclient <= 5.2.8
@@ -169,6 +170,8 @@ install -m 0644 client/share/ltsp/ltsp_config $RPM_BUILD_ROOT/%{_datadir}/ltsp/
 install -m 0755 client/share/ltsp/screen_session $RPM_BUILD_ROOT/%{_datadir}/ltsp/
 install -m 0755 client/share/ltsp/configure-x.sh $RPM_BUILD_ROOT/%{_datadir}/ltsp/
 install -m 0755 client/share/ltsp/update-kernels $RPM_BUILD_ROOT/%{_datadir}/ltsp/
+install -m 0755 client/share/ltsp/x2gothinclient_start $RPM_BUILD_ROOT/%{_datadir}/ltsp/
+install -m 0644 client/share/ltsp/x2gothinclient_sessions $RPM_BUILD_ROOT/%{_datadir}/ltsp/
 install -m 0644 client/initscripts/ltsp-init-common $RPM_BUILD_ROOT/%{_datadir}/ltsp/
 install -m 0755 client/RHEL/initscripts/ltsp-core $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/
 install -m 0644 common/ltsp-common-functions $RPM_BUILD_ROOT/%{_datadir}/ltsp/ltsp-client-common-functions
@@ -196,10 +199,6 @@ cp -av client/share/ltsp/xinitrc.d $RPM_BUILD_ROOT/%{_datadir}/ltsp/
 cp -av client/RHEL/template/* $RPM_BUILD_ROOT%{_datadir}/ltsp/template/
 cp -av client/share/ltsp/init-ltsp.d $RPM_BUILD_ROOT%{_datadir}/ltsp/
 cp -av client/RHEL/share/ltsp/init-ltsp.d/* $RPM_BUILD_ROOT%{_datadir}/ltsp/init-ltsp.d
-%ifarch %{ix86} x86_64
-cp -av client/RHEL/nbd/nbd.ko.x86_64 $RPM_BUILD_ROOT%{_datadir}/ltsp/template/
-cp -av client/RHEL/nbd/nbd.ko.i686 $RPM_BUILD_ROOT%{_datadir}/ltsp/template/
-%endif
 touch $RPM_BUILD_ROOT%{_sysconfdir}/lts.conf
 touch $RPM_BUILD_ROOT%{_localstatedir}/lib/random-seed
 # We need these files in both in client and server, but it ends up in the same place.
@@ -302,7 +301,8 @@ fi
 %post server
 /sbin/chkconfig --add ltsp-dhcpd
 /sbin/chkconfig ltsp-dhcpd on
-[ ! `chkconfig --list iptables|grep on` ] && echo You are running iptables, you may want to run ltsp-server-tweaks to allow clients to connect.
+chkconfig --list|grep -q on
+[ $? -eq 0 ] && echo You are running iptables, you may want to run ltsp-server-tweaks to allow clients to connect.
 #/sbin/chkconfig dnsmasq on
 
 # During upgrades fix up config files
@@ -319,9 +319,9 @@ if [ $1 -gt 1 ]; then
 fi
 
 %preun server
-if [ $1 = 0 ]; then
+if [ "$1" = "0" ]; then
     /sbin/service ltsp-dhcpd status >/dev/null 2>&1
-    if [ $? = 3 ]; then
+    if [ "$?" = "3" ]; then
         /sbin/service ltsp-dhcpd stop >/dev/null 2>&1
     fi
 
@@ -329,10 +329,11 @@ if [ $1 = 0 ]; then
     /sbin/service xinetd reload > /dev/null 2>&1 || :
 fi
 
-%postun server
-if [ $1 -ge 1 ]; then
-    /sbin/service ltsp-dhcpd condrestart >/dev/null 2>&1
-fi
+#%postun server
+#if [ $1 -ge 1 ]; then
+#    /sbin/service ltsp-dhcpd condrestart >/dev/null 2>&1
+#fi
+
 %endif
 
 %files client
@@ -359,6 +360,8 @@ fi
 %{_datadir}/ltsp/xinitrc.d/
 %{_datadir}/ltsp/cleanup.d/ 
 %{_datadir}/ltsp/kioskSession 
+%{_datadir}/ltsp/x2gothinclient_start
+%{_datadir}/ltsp/x2gothinclient_sessions
 %{_datadir}/ltsp/nbd-disconnect
 %{_datadir}/ltsp/ltsp-cleanup
 %{_datadir}/ltsp/ltsp_config.d/
@@ -382,10 +385,6 @@ fi
 %{_sysconfdir}/dracut.conf.d/ltsp-dracut.conf
 %dir %{_localstatedir}/cache/ltsp-localapps/
 %dir %{_localstatedir}/cache/ltsp/
-%ifarch %{ix86} x86_64
-%{_datadir}/ltsp/template/nbd.ko.i686
-%{_datadir}/ltsp/template/nbd.ko.x86_64
-%endif
 
 # readonly-root related files
 %{_localstatedir}/lib/random-seed
@@ -468,7 +467,10 @@ fi
 
 
 %changelog
-* Sun Mar 17 2013 Joshua Trimm <enslaver at enslaver.com> - 5.4.5
+* Sun Apr 28 2013 Joshua Trimm <enslaver at enslaver.com> - 5.4.5-20
+ - Prep for stable release, mock changes, enabled nbd and fixed misc bugs.
+
+* Sun Mar 17 2013 Joshua Trimm <enslaver at enslaver.com> - 5.4.5-9
    New features include:
  - UnionFS overlay filesystem to make / filesystem read-write
  - New chroot builder that uses mock instead of livecd-tools
diff --git a/sources b/sources
index 5a383db..d410405 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-29b1d161ccc1f7d436cbb680563ef619  ltsp-5.4.5.tar.bz2
+48db8b5cb524716f53566e1eaed7f461  ltsp-5.4.5.tar.bz2