rpms/ltsp/F-9 .cvsignore, 1.21, 1.22 ltsp.spec, 1.30, 1.31 sources, 1.25, 1.26
Warren Togami 砥上勇
wtogami at fedoraproject.org
Sun Oct 5 23:59:57 UTC 2008
- Previous message (by thread): rpms/kdelibs/devel kdelibs-4.1.1-kdeui-widgets-fixes.patch, 1.2, NONE
- Next message (by thread): rpms/kdelibs4/F-8 .cvsignore, 1.13, 1.14 kdelibs4.spec, 1.36, 1.37 sources, 1.13, 1.14 kdelibs-4.0.5-fedora-buildtype.patch, 1.1, NONE kdelibs-4.1.0-#455130.patch, 1.1, NONE kdelibs-4.1.1-kde#157789.patch, 1.1, NONE kdelibs-4.1.1-kde#169447-khtml-regression.patch, 1.1, NONE kdelibs-4.1.1-kde#856379-cookiejar.patch, 1.1, NONE kdelibs-4.1.1-kde#856403-urlnav.patch, 1.1, NONE kdelibs-4.1.1-kde#858795-mimeassoc.patch, 1.1, NONE kdelibs-4.1.1-kde#860005-emoticons.patch, 1.1, NONE kdelibs-4.1.1-kde#860095-khtml-scroll-crash.patch, 1.1, NONE kdelibs-4.1.1-kdelibs-4.1.1-kde#170461-khtml-regression.patch, 1.1, NONE kdelibs-4.1.1-kdeui-widgets-fixes.patch, 1.2, NONE kdelibs-4.1.1-kutils-fixes.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: wtogami
Update of /cvs/pkgs/rpms/ltsp/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17198
Modified Files:
.cvsignore ltsp.spec sources
Log Message:
- 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/F-9/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore 11 Sep 2008 19:29:33 -0000 1.21
+++ .cvsignore 5 Oct 2008 23:59:27 -0000 1.22
@@ -1 +1 @@
-ltsp-5.1.24.tar.bz2
+ltsp-5.1.25.tar.bz2
Index: ltsp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/F-9/ltsp.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- ltsp.spec 11 Sep 2008 19:29:33 -0000 1.30
+++ ltsp.spec 5 Oct 2008 23:59:27 -0000 1.31
@@ -1,6 +1,6 @@
Name: ltsp
-Version: 5.1.24
-%define _datestamp .20080911.14
+Version: 5.1.25
+%define _datestamp .20081005.19
#Release: 4%{_datestamp}%{?dist}
Release: 1%{?dist}
Summary: Linux Terminal Server Project Server and Client
@@ -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,11 @@
%endif
%changelog
+* 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/F-9/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources 11 Sep 2008 19:29:33 -0000 1.25
+++ sources 5 Oct 2008 23:59:27 -0000 1.26
@@ -1 +1 @@
-0edb9dacd14a9db3e41ed5dc80fdea62 ltsp-5.1.24.tar.bz2
+dc016dc9a5cf58c500f4929fa52309a1 ltsp-5.1.25.tar.bz2
- Previous message (by thread): rpms/kdelibs/devel kdelibs-4.1.1-kdeui-widgets-fixes.patch, 1.2, NONE
- Next message (by thread): rpms/kdelibs4/F-8 .cvsignore, 1.13, 1.14 kdelibs4.spec, 1.36, 1.37 sources, 1.13, 1.14 kdelibs-4.0.5-fedora-buildtype.patch, 1.1, NONE kdelibs-4.1.0-#455130.patch, 1.1, NONE kdelibs-4.1.1-kde#157789.patch, 1.1, NONE kdelibs-4.1.1-kde#169447-khtml-regression.patch, 1.1, NONE kdelibs-4.1.1-kde#856379-cookiejar.patch, 1.1, NONE kdelibs-4.1.1-kde#856403-urlnav.patch, 1.1, NONE kdelibs-4.1.1-kde#858795-mimeassoc.patch, 1.1, NONE kdelibs-4.1.1-kde#860005-emoticons.patch, 1.1, NONE kdelibs-4.1.1-kde#860095-khtml-scroll-crash.patch, 1.1, NONE kdelibs-4.1.1-kdelibs-4.1.1-kde#170461-khtml-regression.patch, 1.1, NONE kdelibs-4.1.1-kdeui-widgets-fixes.patch, 1.2, NONE kdelibs-4.1.1-kutils-fixes.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list