rpms/ltsp/F-9 .cvsignore, 1.26, 1.27 ltsp.spec, 1.36, 1.37 sources, 1.30, 1.31

Warren Togami 砥上勇 wtogami at fedoraproject.org
Thu Nov 13 15:21:47 UTC 2008


Author: wtogami

Update of /cvs/pkgs/rpms/ltsp/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13392

Modified Files:
	.cvsignore ltsp.spec sources 
Log Message:
- Enable plymouth support if supported hardware is detected
- jetpipe supports serial printers
- TIMEZONE and TIMESERVER options for thin clients
- Move LDM to VT1 by default
- Prevent error during client chroot config
- Many other little bug fixes



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/F-9/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	1 Nov 2008 10:15:33 -0000	1.26
+++ .cvsignore	13 Nov 2008 15:21:17 -0000	1.27
@@ -1 +1 @@
-ltsp-5.1.32.tar.bz2
+ltsp-5.1.34.tar.bz2


Index: ltsp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/F-9/ltsp.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- ltsp.spec	1 Nov 2008 10:15:33 -0000	1.36
+++ ltsp.spec	13 Nov 2008 15:21:17 -0000	1.37
@@ -1,6 +1,6 @@
 Name:           ltsp
-Version:        5.1.32
-%define _datestamp .20081031.14
+Version:        5.1.34
+%define _datestamp .20081112.21
 #Release:        0%{_datestamp}%{?dist}
 Release:        1%{?dist}
 Summary:        Linux Terminal Server Project Server and Client
@@ -38,7 +38,6 @@
 %description
 LTSP client and server
 
-%if 0%{?fedora}
 %package client
 Summary:        LTSP client
 Group:          User Interface/Desktops
@@ -51,12 +50,12 @@
 %description client
 LTSP client package
 This package contains the scripts necessary to boot as a LTSP5 thin client.
-%endif
 
 %package server
 Summary:        LTSP server
 Group:          User Interface/Desktops
 %if 0%{?fedora}
+# XXX: Fix this after RHEL5 livecd-tools backports is complete.
 # needed to install client chroots
 Requires:       livecd-tools >= 015
 %endif
@@ -107,7 +106,6 @@
 %install
 ##### make directories
 rm -rf $RPM_BUILD_ROOT
-%if 0%{?fedora}
 # client
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 mkdir -p $RPM_BUILD_ROOT%{_sbindir}
@@ -116,11 +114,11 @@
 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}/ltsp/template/
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/ldm/rc.d/
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/kernel/postinst.d/
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/kernel/prerm.d/
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/
-%endif
 
 # server
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8
@@ -150,7 +148,6 @@
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ltsp/live-config/
 
-%if 0%{?fedora}
 ###### client install
 pushd localapps
     make install DESTDIR=$RPM_BUILD_ROOT
@@ -167,6 +164,7 @@
 install -m 0755 client/initscripts/RPM/ltsp-client-launch $RPM_BUILD_ROOT%{_sbindir}
 install -m 0644 client/rwtab.d/k12linux.rwtab $RPM_BUILD_ROOT%{_sysconfdir}/rwtab.d
 install -m 0644 client/screen-x-common $RPM_BUILD_ROOT/%{_datadir}/ltsp/
+install -m 0755 client/xinitrc $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 0755 client/scripts/k12linux/ltsp-rewrap-latest-kernel $RPM_BUILD_ROOT/%{_sbindir}
@@ -174,6 +172,8 @@
 install -m 0755 localapps/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/
+cp -av client/xinitrc.d $RPM_BUILD_ROOT/%{_datadir}/ltsp/
+cp -av client/template/k12linux/* $RPM_BUILD_ROOT%{_datadir}/ltsp/template/
 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.
@@ -183,17 +183,14 @@
 install -m 0644 server/configs/k12linux/mkinitrd/sysconfig-mkinitrd $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/mkinitrd.ltsp-template
 install -m 0755 server/configs/k12linux/mkinitrd/ltsp-postinst.d $RPM_BUILD_ROOT%{_sysconfdir}/kernel/postinst.d/ltsp
 install -m 0755 server/configs/k12linux/mkinitrd/ltsp-prerm.d    $RPM_BUILD_ROOT%{_sysconfdir}/kernel/prerm.d/ltsp
-%endif
 
 ### server install
 install -m 0755 localapps/ltsp-localapps  $RPM_BUILD_ROOT/%{_bindir}/
 install -m 0755 server/nbdrootd $RPM_BUILD_ROOT%{_sbindir}
 install -m 0755 server/nbdswapd $RPM_BUILD_ROOT%{_sbindir}
 install -m 0755 server/ltsp-update-sshkeys $RPM_BUILD_ROOT%{_sbindir}
-%if 0%{?fedora}
 install -m 0755 server/ltsp-build-client $RPM_BUILD_ROOT%{_sbindir}
 cp -pr server/plugins/* $RPM_BUILD_ROOT%{_datadir}/ltsp/plugins/
-%endif
 install -m 0755 server/ltsp-update-kernels $RPM_BUILD_ROOT%{_sbindir}
 install -m 0755 server/scripts/k12linux/ltsp-update-image $RPM_BUILD_ROOT%{_sbindir}
 install -m 0755 server/scripts/k12linux/chroot-creator $RPM_BUILD_ROOT%{_sbindir}
@@ -257,10 +254,8 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%if 0%{?fedora}
 %post client
 /usr/share/ltsp/ltsp-chroot-setup
-%endif
 
 %post server
 /sbin/chkconfig --add ltsp-dhcpd
@@ -300,7 +295,6 @@
     /sbin/service ltsp-dhcpd condrestart >/dev/null 2>&1
 fi
 
-%if 0%{?fedora}
 %files client
 %defattr(-,root,root,-)
 %{_mandir}/man1/getltscfg.1.gz
@@ -315,6 +309,9 @@
 %{_datadir}/ltsp/screen_session
 %{_datadir}/ltsp/screen-x-common
 %{_datadir}/ltsp/screen.d/
+%{_datadir}/ltsp/xinitrc
+%{_datadir}/ltsp/xinitrc.d/
+%{_datadir}/ltsp/template/
 %{_datadir}/ldm/rc.d/
 %{_sbindir}/jetpipe
 %{_sbindir}/ltsp-rewrap-latest-kernel
@@ -330,7 +327,6 @@
 %{_sysconfdir}/rwtab.d/*
 %{_localstatedir}/lib/random-seed
 %config(noreplace) %{_sysconfdir}/lts.conf
-%endif
 
 %files server
 %defattr(-,root,root,-)
@@ -357,10 +353,8 @@
 %dir /opt/ltsp
 %dir /opt/ltsp/images
 
-%if 0%{?fedora}
 %{_sbindir}/ltsp-build-client
 %{_datadir}/ltsp/plugins/
-%endif
 %{_sbindir}/ltsp-prepare-kernel
 %{_sbindir}/ltsp-server-initialize
 %{_sbindir}/ltsp-update-kernels
@@ -394,7 +388,6 @@
 %{_sysconfdir}/ltsp/kickstart/Fedora/common-i386.ks
 %{_sysconfdir}/ltsp/kickstart/Fedora/common-i686.ks
 %{_sysconfdir}/ltsp/kickstart/Fedora/common-x86_64.ks
-%dir %{_sysconfdir}/ltsp/kickstart/Fedora/8/
 %dir %{_sysconfdir}/ltsp/kickstart/Fedora/9/
 %{_sysconfdir}/ltsp/kickstart/*/*/*.ks
 %dir %{_sysconfdir}/ltsp/mkinitrd/
@@ -412,6 +405,14 @@
 %endif
 
 %changelog
+* Thu Nov 13 2008 Warren Togami <wtogami at redhat.com> - 5.1.34-1
+- Enable plymouth support if supported hardware is detected
+- jetpipe supports serial printers
+- TIMEZONE and TIMESERVER options for thin clients
+- Move LDM to VT1 by default
+- Prevent error during client chroot config
+- Many other little bug fixes
+
 * Sat Nov 01 2008 Warren Togami <wtogami at redhat.com> - 5.1.32-1
 - Exclude wireless drivers because they cannot netboot, and they can often
   cause boot problems because of missing firmware


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/F-9/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	1 Nov 2008 10:15:33 -0000	1.30
+++ sources	13 Nov 2008 15:21:17 -0000	1.31
@@ -1 +1 @@
-a317c6e06a393bb7769d375d9cb42226  ltsp-5.1.32.tar.bz2
+56a29426ee1d34035252de9d9394f721  ltsp-5.1.34.tar.bz2




More information about the scm-commits mailing list