rpms/ltsp/F-9 .cvsignore, 1.20, 1.21 ltsp.spec, 1.29, 1.30 sources, 1.24, 1.25
Warren Togami 砥上勇
wtogami at fedoraproject.org
Thu Sep 11 19:30:03 UTC 2008
Author: wtogami
Update of /cvs/pkgs/rpms/ltsp/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21244
Modified Files:
.cvsignore ltsp.spec sources
Log Message:
- lts.conf options: VOLUME, HEADPHONE_VOLUME, PCM_VOLUME, CD_VOLUME, FRONT_VOLUME
Set values higher than default if not specified in lts.conf.
MIC_VOLUME not set by default, but can be controlled by lts.conf.
- xrexec renamed to ltsp-localapps
- xrexecd.sh renamed to ltsp-localappsd
- fix build on RHEL-5
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/F-9/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore 10 Sep 2008 14:47:45 -0000 1.20
+++ .cvsignore 11 Sep 2008 19:29:33 -0000 1.21
@@ -1 +1 @@
-ltsp-5.1.23.tar.bz2
+ltsp-5.1.24.tar.bz2
Index: ltsp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/F-9/ltsp.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ltsp.spec 10 Sep 2008 14:47:45 -0000 1.29
+++ ltsp.spec 11 Sep 2008 19:29:33 -0000 1.30
@@ -1,7 +1,7 @@
Name: ltsp
-Version: 5.1.23
-%define _datestamp .20080910.10
-#Release: 3%{_datestamp}%{?dist}
+Version: 5.1.24
+%define _datestamp .20080911.14
+#Release: 4%{_datestamp}%{?dist}
Release: 1%{?dist}
Summary: Linux Terminal Server Project Server and Client
Group: User Interface/Desktops
@@ -97,7 +97,7 @@
make %{?_smp_mflags}
popd
-pushd client/xrexecd
+pushd localapps
%configure
make %{?_smp_mflags}
popd
@@ -128,6 +128,7 @@
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ltsp/mkinitrd/
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/init.d/
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_sbindir}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/ltsp/scripts/
mkdir -p $RPM_BUILD_ROOT%{_datadir}/ltsp/scripts.d/
@@ -139,6 +140,7 @@
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/network-scripts/
mkdir -p $RPM_BUILD_ROOT/opt/ltsp
mkdir -p $RPM_BUILD_ROOT/opt/ltsp/images
+mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/cache/localapps/
mkdir -p $RPM_BUILD_ROOT%{_tftpdir}/ltsp/i386/pxelinux.cfg/
mkdir -p $RPM_BUILD_ROOT%{_tftpdir}/ltsp/x86_64/pxelinux.cfg/
@@ -149,10 +151,10 @@
%if 0%{?fedora}
###### client install
-pushd client/xrexecd
+pushd localapps
make install DESTDIR=$RPM_BUILD_ROOT
popd
-install -m 0755 client/xrexecd/xrexecd.sh $RPM_BUILD_ROOT/%{_bindir}/
+install -m 0755 localapps/ltsp-localappsd $RPM_BUILD_ROOT/%{_bindir}/
install -m 0755 client/getltscfg/getltscfg $RPM_BUILD_ROOT/%{_bindir}/getltscfg
install -m 0644 client/getltscfg/getltscfg.1 $RPM_BUILD_ROOT/%{_mandir}/man1/
@@ -168,21 +170,21 @@
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}
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/
+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/
touch $RPM_BUILD_ROOT%{_sysconfdir}/lts.conf
touch $RPM_BUILD_ROOT%{_localstatedir}/lib/random-seed
-%endif
# 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
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 client/xrexecd/xrexec $RPM_BUILD_ROOT/%{_bindir}/
+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/ldminfod $RPM_BUILD_ROOT%{_sbindir}
@@ -312,7 +314,7 @@
%{_mandir}/man8/jetpipe.8.gz
%{_datadir}/ltsp/ltsp-chroot-setup
%{_datadir}/ltsp/chroot-setup.d/
-%{_bindir}/xrexecd.sh
+%{_bindir}/ltsp-localappsd
%{_sysconfdir}/sysconfig/mkinitrd
%{_sysconfdir}/kernel/postinst.d/ltsp
%{_sysconfdir}/kernel/prerm.d/ltsp
@@ -342,7 +344,7 @@
%config(noreplace) %{_tftpdir}/ltsp/i386/pxelinux.cfg/default
%config(noreplace) %{_tftpdir}/ltsp/x86_64/pxelinux.cfg/default
%endif
-%{_bindir}/xrexec
+%{_bindir}/ltsp-localapps
%{_sysconfdir}/ltsp/live-config/
%dir /opt/ltsp
@@ -372,6 +374,7 @@
%config(noreplace) %{_sysconfdir}/xinetd.d/nbdswapd
%config(noreplace) %{_sysconfdir}/xinetd.d/ldminfod
%dir %{_sysconfdir}/ltsp/
+%dir %{_localstatedir}/cache/localapps/
# Configuration Files
%config(noreplace) %{_sysconfdir}/sysconfig/ltsp-dhcpd
%config(noreplace) %{_sysconfdir}/sysconfig/network-scripts/ifcfg-ltspbr0
@@ -404,6 +407,14 @@
%endif
%changelog
+* 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.
+ MIC_VOLUME not set by default, but can be controlled by lts.conf.
+- xrexec renamed to ltsp-localapps
+- xrexecd.sh renamed to ltsp-localappsd
+- fix build on RHEL-5
+
* Wed Sep 10 2008 Warren Togami <wtogami at redhat.com> - 5.1.23-1
- Point F8 and F9 client chroot builder at newkey repos
- Ensure that initscripts installs before ltsp-client
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/F-9/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources 10 Sep 2008 14:47:45 -0000 1.24
+++ sources 11 Sep 2008 19:29:33 -0000 1.25
@@ -1 +1 @@
-65f3c87d86ef8e42bc6d417876182968 ltsp-5.1.23.tar.bz2
+0edb9dacd14a9db3e41ed5dc80fdea62 ltsp-5.1.24.tar.bz2
More information about the fedora-extras-commits
mailing list