rpms/ltsp/devel .cvsignore, 1.10, 1.11 ltsp.spec, 1.14, 1.15 sources, 1.14, 1.15

[Warren Togami 砥上勇]

Author: wtogami

Update of /cvs/pkgs/rpms/ltsp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3090

Modified Files:
	.cvsignore ltsp.spec sources 
Log Message:
- Fix copying of mkinitrd config file within chroot
- Bug #462228 Prevent bogus mkinitrd config from landing on systems who
  accidentally install ltsp-client for no good reason. (Thanks John Ellson)
- Remove irrelevant plugins from package



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	11 Sep 2008 19:32:21 -0000	1.10
+++ .cvsignore	6 Oct 2008 03:43:45 -0000	1.11
@@ -1 +1 @@
-ltsp-5.1.24.tar.bz2
+ltsp-5.1.26.tar.bz2


Index: ltsp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/devel/ltsp.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ltsp.spec	11 Sep 2008 19:32:21 -0000	1.14
+++ ltsp.spec	6 Oct 2008 03:43:45 -0000	1.15
@@ -1,7 +1,7 @@
 Name:           ltsp
-Version:        5.1.24
-%define _datestamp .20080911.14
-#Release:        4%{_datestamp}%{?dist}
+Version:        5.1.26
+%define _datestamp .20081005.20
+#Release:        2%{_datestamp}%{?dist}
 Release:        1%{?dist}
 Summary:        Linux Terminal Server Project Server and Client
 Group:          User Interface/Desktops
@@ -178,7 +178,8 @@
 # We need these files in both in client and server, but it ends up in the same place.
 # client copy is to ensure that it gets upgraded with ltsp-client package upgrades.
 # server copy is so chroot-creator can copy it into the chroot before mkinitrd runs the first time.
-install -m 0644 server/configs/k12linux/mkinitrd/sysconfig-mkinitrd $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/mkinitrd
+# the real client copy is written during ltsp-client %post iff it is actually a client chroot.
+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
@@ -217,6 +218,13 @@
 cp -a server/configs/k12linux/live-config/* $RPM_BUILD_ROOT%{_sysconfdir}/ltsp/live-config/
 install -m 0644 server/scripts/k12linux/mksquashfs-exclude $RPM_BUILD_ROOT/%{_datadir}/ltsp/
 
+# Remove irrelevant plugins from package
+rm -rf $RPM_BUILD_ROOT%{_datadir}/ltsp/plugins/ltsp-build-client/ALTLinux/
+rm -rf $RPM_BUILD_ROOT%{_datadir}/ltsp/plugins/ltsp-build-client/Debian/
+rm -rf $RPM_BUILD_ROOT%{_datadir}/ltsp/plugins/ltsp-build-client/Gentoo/
+rm -rf $RPM_BUILD_ROOT%{_datadir}/ltsp/plugins/ltsp-build-client/SUSE_LINUX/
+rm -rf $RPM_BUILD_ROOT%{_datadir}/ltsp/plugins/ltsp-build-client/Ubuntu/
+
 # configs
 install -m 0644 server/configs/k12linux/ifcfg-ltspbr0 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/network-scripts/
 install -m 0644 server/configs/k12linux/ltsp-dhcpd.conf $RPM_BUILD_ROOT%{_sysconfdir}/ltsp/dhcpd.conf
@@ -315,7 +323,7 @@
 %{_datadir}/ltsp/ltsp-chroot-setup
 %{_datadir}/ltsp/chroot-setup.d/
 %{_bindir}/ltsp-localappsd
-%{_sysconfdir}/sysconfig/mkinitrd
+%{_sysconfdir}/sysconfig/mkinitrd.ltsp-template
 %{_sysconfdir}/kernel/postinst.d/ltsp
 %{_sysconfdir}/kernel/prerm.d/ltsp
 
@@ -407,6 +415,14 @@
 %endif
 
 %changelog
+* Sun Oct 05 2008 Warren Togami <wtogami at redhat.com> - 5.1.26-1
+- Fix copying of mkinitrd config file within chroot
+
+* Sun Oct 05 2008 Warren Togami <wtogami at redhat.com> - 5.1.25-1
+- Bug #462228 Prevent bogus mkinitrd config from landing on systems who
+  accidentally install ltsp-client for no good reason. (Thanks John Ellson)
+- Remove irrelevant plugins from package
+
 * Thu Sep 11 2008 Warren Togami <wtogami at redhat.com> - 5.1.24-1
 - lts.conf options: VOLUME, HEADPHONE_VOLUME, PCM_VOLUME, CD_VOLUME, FRONT_VOLUME
   Set values higher than default if not specified in lts.conf.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	11 Sep 2008 19:32:21 -0000	1.14
+++ sources	6 Oct 2008 03:43:45 -0000	1.15
@@ -1 +1 @@
-0edb9dacd14a9db3e41ed5dc80fdea62  ltsp-5.1.24.tar.bz2
+ca86f842a300b8fb8b47d8daa9262fd5  ltsp-5.1.26.tar.bz2