rpms/ltsp/F-9 .cvsignore, 1.11, 1.12 ltsp.spec, 1.18, 1.19 sources, 1.15, 1.16

[Warren Togami 砥上勇 (wtogami)]

Author: wtogami

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

Modified Files:
	.cvsignore ltsp.spec sources 
Log Message:
- Move some chroot setup into ltsp-client %%post so things can be fixed
  by ltsp-client package updates in the future.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/F-9/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	10 Jul 2008 15:49:58 -0000	1.11
+++ .cvsignore	16 Jul 2008 20:54:32 -0000	1.12
@@ -1 +1 @@
-ltsp-5.1.11.tar.bz2
+ltsp-5.1.12.tar.bz2


Index: ltsp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/F-9/ltsp.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ltsp.spec	10 Jul 2008 15:49:58 -0000	1.18
+++ ltsp.spec	16 Jul 2008 20:54:32 -0000	1.19
@@ -1,7 +1,7 @@
 Name:           ltsp
-Version:        5.1.11
-#%define _datestamp .20080707.13
-#Release:        1%{_datestamp}%{?dist}
+Version:        5.1.12
+%define _datestamp .20080716.16
+#Release:        0%{_datestamp}%{?dist}
 Release:        1%{?dist}
 Summary:        Linux Terminal Server Project Server and Client
 Group:          User Interface/Desktops
@@ -16,6 +16,7 @@
 BuildRequires: popt-devel
 BuildRequires: flex bison
 BuildRequires: automake
+BuildRequires: pkgconfig
 BuildRequires: libX11-devel
 %ifarch %{ix86} x86_64
 # Need pxelinux.0 from syslinux if server is x86
@@ -23,8 +24,12 @@
 %endif
 BuildRequires: tftp-server
 
-# Need location of tftpboot directory from tftp-server
-%define _tftpdir %(cat /etc/xinetd.d/tftp |grep server_args | awk -F"-s " {'print $2'} || echo -n "/BOGUS/DIRECTORY")
+# tftpboot directory location changed in F9+
+%if 0%{?fedora} > 8 || 0%{?rhel} > 5
+%define _tftpdir /var/lib/tftpboot
+%else
+%define _tftpdir /tftpboot
+%endif
 
 %description
 LTSP client and server
@@ -79,7 +84,6 @@
 popd
 
 pushd client/xrexecd
-  ./autogen.sh
   %configure
   make %{?_smp_mflags}
 popd
@@ -95,6 +99,7 @@
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rwtab.d/
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/ltsp/
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/ltsp/chroot-setup.d/
 
 # server
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8
@@ -136,6 +141,8 @@
 install -m 0644 client/screen-x-common $RPM_BUILD_ROOT/%{_datadir}/ltsp/
 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/
+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
 touch $RPM_BUILD_ROOT%{_localstatedir}/lib/random-seed
@@ -166,7 +173,6 @@
 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/
-install -m 0644 server/configs/k12linux/etchosts.template $RPM_BUILD_ROOT/%{_datadir}/ltsp/scripts/etchosts.template
 
 # configs
 install -m 0644 server/configs/k12linux/ifcfg-ltspbr0 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/network-scripts/
@@ -200,6 +206,9 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post client
+/usr/share/ltsp/ltsp-chroot-setup
+
 %post server
 /sbin/chkconfig --add ltsp-dhcpd
 
@@ -235,7 +244,8 @@
 %{_datadir}/ltsp/screen.d/
 %{_sbindir}/jetpipe
 %{_mandir}/man8/jetpipe.8.gz
-
+%{_datadir}/ltsp/ltsp-chroot-setup
+%{_datadir}/ltsp/chroot-setup.d/
 
 # readonly-root related files
 %{_sysconfdir}/rwtab.d/*
@@ -314,6 +324,10 @@
 %endif
 
 %changelog
+* Wed Jul 16 2008 Warren Togami <wtogami at redhat.com> - 5.1.12-1
+- Move some chroot setup into ltsp-client %%post so things can be fixed
+  by ltsp-client package updates in the future.
+
 * Thu Jul 10 2008 Warren Togami <wtogami at redhat.com> - 5.1.11-1
 - LDM_DIRECTX=yes unencrypted X by default in lts.conf
   This is for performance and scalability.  Turn it off if you want security.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/F-9/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	10 Jul 2008 15:49:58 -0000	1.15
+++ sources	16 Jul 2008 20:54:32 -0000	1.16
@@ -1 +1 @@
-0d4f4a0bede9dddeceb979c65617f0e9  ltsp-5.1.11.tar.bz2
+63e0f7ebbd4001c1f41a57f32a155a3c  ltsp-5.1.12.tar.bz2