rpms/ltsp/F-9 .cvsignore, 1.15, 1.16 ltsp.spec, 1.24, 1.25 sources, 1.19, 1.20

[Warren Togami 砥上勇 (wtogami)]

Author: wtogami

Update of /cvs/pkgs/rpms/ltsp/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18829

Modified Files:
	.cvsignore ltsp.spec sources 
Log Message:
- cleanups to localapps scripts
- moved localapp stuff from ldm into this package
- Fix nbdswap
  nbd was missing in both client and server
  nbdswapd had a bogus path to nbd-server
- Automatic setup of coreboot/ELF capable Etherboot images
  created by mkelfimage.  dhcpd.conf default serves this to
  any client reporting itself as "Etherboot-5.4".
- Include live-config within ltsp-server



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/F-9/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	8 Aug 2008 01:08:53 -0000	1.15
+++ .cvsignore	13 Aug 2008 18:12:29 -0000	1.16
@@ -1 +1 @@
-ltsp-5.1.15.tar.bz2
+ltsp-5.1.18.tar.bz2


Index: ltsp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/F-9/ltsp.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ltsp.spec	8 Aug 2008 01:08:53 -0000	1.24
+++ ltsp.spec	13 Aug 2008 18:12:29 -0000	1.25
@@ -1,7 +1,7 @@
 Name:           ltsp
-Version:        5.1.15
-%define _datestamp .20080807.20
-#Release:        6%{_datestamp}%{?dist}
+Version:        5.1.18
+%define _datestamp .20080813.12
+#Release:        1%{_datestamp}%{?dist}
 Release:        1%{?dist}
 Summary:        Linux Terminal Server Project Server and Client
 Group:          User Interface/Desktops
@@ -44,6 +44,7 @@
 Group:          User Interface/Desktops
 Requires:       chkconfig
 Requires:       ltspfsd
+Requires:       nbd
 BuildRequires:  glib2-devel
 
 %description client
@@ -63,6 +64,7 @@
 Requires:       dhcp
 Requires:       gettext
 Requires:       bridge-utils
+Requires:       nbd
 Requires(post): chkconfig
 Requires(preun): chkconfig
 
@@ -112,6 +114,7 @@
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/ltsp/
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/ltsp/chroot-setup.d/
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/ldm/rc.d/
 %endif
 
 # server
@@ -137,6 +140,8 @@
 mkdir -p $RPM_BUILD_ROOT%{_tftpdir}/ltsp/ppc/
 mkdir -p $RPM_BUILD_ROOT%{_tftpdir}/ltsp/ppc64/
 
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ltsp/live-config/
+
 %if 0%{?fedora}
 ###### client install
 pushd client/xrexecd
@@ -157,6 +162,7 @@
 install -m 0755 client/jetpipe/jetpipe $RPM_BUILD_ROOT/%{_sbindir}
 install -m 0644 client/jetpipe/jetpipe.8 $RPM_BUILD_ROOT/%{_mandir}/man8/
 install -m 0700 client/chroot-setup/ltsp-chroot-setup $RPM_BUILD_ROOT/%{_datadir}/ltsp/
+install -m 0755 client/xrexecd/ldm-rc.d/S01-localapps $RPM_BUILD_ROOT%{_datadir}/ldm/rc.d/
 cp -av client/chroot-setup/k12linux/* $RPM_BUILD_ROOT%{_datadir}/ltsp/chroot-setup.d/
 cp -av client/screen.d $RPM_BUILD_ROOT/%{_datadir}/ltsp/
 touch $RPM_BUILD_ROOT%{_sysconfdir}/lts.conf
@@ -193,6 +199,7 @@
 install -m 0755 server/scripts/k12linux/dhcpd-update $RPM_BUILD_ROOT/%{_datadir}/ltsp/scripts/
 cp -p server/scripts/k12linux/scripts.d/*   $RPM_BUILD_ROOT%{_datadir}/ltsp/scripts.d/
 cp -p server/scripts/k12linux/chkconfig.d/* $RPM_BUILD_ROOT%{_datadir}/ltsp/chkconfig.d/
+cp -a server/configs/k12linux/live-config/* $RPM_BUILD_ROOT%{_sysconfdir}/ltsp/live-config/
 
 # configs
 install -m 0644 server/configs/k12linux/ifcfg-ltspbr0 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/network-scripts/
@@ -266,6 +273,7 @@
 %{_datadir}/ltsp/screen_session
 %{_datadir}/ltsp/screen-x-common
 %{_datadir}/ltsp/screen.d/
+%{_datadir}/ldm/rc.d/
 %{_sbindir}/jetpipe
 %{_mandir}/man8/jetpipe.8.gz
 %{_datadir}/ltsp/ltsp-chroot-setup
@@ -282,7 +290,7 @@
 %defattr(-,root,root,-)
 %doc ChangeLog COPYING TODO server/doc/lts-parameters.txt
 %dir %{_localstatedir}/lib/ltsp/
-%dir %{_localstatedir}/lib/ltsp/swapfiles/
+%attr(700,nobody,nobody) %dir %{_localstatedir}/lib/ltsp/swapfiles/
 %dir %{_tftpdir}/
 %dir %{_tftpdir}/ltsp/
 %dir %{_tftpdir}/ltsp/i386/
@@ -298,6 +306,7 @@
 %config(noreplace) %{_tftpdir}/ltsp/x86_64/pxelinux.cfg/default
 %endif
 %{_bindir}/xrexec
+%{_sysconfdir}/ltsp/live-config/
 
 %dir /opt/ltsp
 
@@ -352,6 +361,19 @@
 %endif
 
 %changelog
+* Wed Aug 13 2008 Warren Togami <wtogami at redhat.com> - 5.1.18-1
+- cleanups to localapps scripts
+- moved localapp stuff from ldm into this package
+- Fix nbdswap
+  nbd was missing in both client and server
+  nbdswapd had a bogus path to nbd-server
+- Automatic setup of coreboot/ELF capable Etherboot images
+  created by mkelfimage.  dhcpd.conf default serves this to
+  any client reporting itself as "Etherboot-5.4".
+
+* Fri Aug 08 2008 Warren Togami <wtogami at redhat.com> - 5.1.15-4
+- Include live-config within ltsp-server
+
 * Thu Aug 07 2008 Warren Togami <wtogami at redhat.com> - 5.1.15-1
 - kickstart files are no longer %%config(noreplace).
 - Many minor fixes to silence error messages during boot/shutdown.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/F-9/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	8 Aug 2008 01:08:53 -0000	1.19
+++ sources	13 Aug 2008 18:12:29 -0000	1.20
@@ -1 +1 @@
-8004eb1c12dd2ea63882e65a0ee961ac  ltsp-5.1.15.tar.bz2
+2993c84f7ed67436bce36eded3571185  ltsp-5.1.18.tar.bz2