rendered paste body=== modified file 'ltsp.spec'--- ltsp.spec 2008-03-07 05:55:39 +0000+++ ltsp.spec 2008-03-07 14:10:37 +0000@@ -11,12 +11,17 @@ BuildRequires: popt-devel BuildRequires: flex bison BuildRequires: automake+%if 0%{?suse_version} +BuildRequires: xorg-x11-libX11-devel+BuildRequires: tftp +%else BuildRequires: libX11-devel-%ifarch i386 x86_64+BuildRequires: tftp-server+%endif+%ifarch %ix86 x86_64 # Need pxelinux.0 from syslinux if server is x86 BuildRequires: syslinux # Need location of tftpboot directory from tftp-server-BuildRequires: tftp-server %define _tftpdir %(cat /etc/xinetd.d/tftp |grep server_args | awk -F"-s " {'print $2'} || echo -n "/BOGUS/DIRECTORY") %endif @@ -33,18 +38,22 @@ %package server Summary: LTSP server-Group: User Interface/Desktops # needed to install client chroots+%if 0%{?suse_version}+Group: System+Requires: kiwi smart ltspfs kiwi-desc-netboot kiwi-pxeboot dhcp-server pulseaudio pulseaudio-libs+%else+Group: User Interface/Desktops Requires: livecd-tools >= 015 Requires: tftp-server Requires: ltspfs Requires: dhcp Requires: gettext-+%endif %description server LTSP server -%ifarch i386 x86_64+%ifarch %ix86 x86_64 %package vmclient Summary: LTSP Virtual Machine Client Group: Applications/Emulators@@ -99,15 +108,16 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/ltsp/swapfiles/ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/network-scripts/ -%ifarch i386 x86_64+%ifarch %ix86 x86_64 mkdir -p $RPM_BUILD_ROOT%{_tftpdir}/ltsp/i386/pxelinux.cfg/ mkdir -p $RPM_BUILD_ROOT%{_tftpdir}/ltsp/x86_64/pxelinux.cfg/ %endif mkdir -p $RPM_BUILD_ROOT%{_tftpdir}/ltsp/ppc/ mkdir -p $RPM_BUILD_ROOT%{_tftpdir}/ltsp/ppc64/ -%ifarch i386 x86_64+%ifarch %ix86 x86_64 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/network-scripts/ %endif @@ -163,22 +173,28 @@ install -m 0644 server/configs/k12linux/ltsp-build-client.conf $RPM_BUILD_ROOT%{_sysconfdir}/ltsp/ install -m 0644 server/configs/k12linux/ltsp-server.conf $RPM_BUILD_ROOT%{_sysconfdir}/ltsp/ -for arch in i386 x86_64 ppc ppc64; do+for arch in %ix86 x86_64 ppc ppc64; do+ mkdir -p $RPM_BUILD_ROOT%{_tftpdir}/ltsp/$arch install -m 0644 server/configs/k12linux/lts.conf $RPM_BUILD_ROOT%{_tftpdir}/ltsp/$arch/ done echo "K12_DIST=%{dist}" | sed 's/\.//' > $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/k12_dist cat server/configs/k12linux/k12_dist.template >> $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/k12_dist -%ifarch i386 x86_64+%ifarch %ix86 x86_64 # PXE install -m 0644 server/configs/pxe-default.conf $RPM_BUILD_ROOT%{_tftpdir}/ltsp/i386/pxelinux.cfg/default install -m 0644 server/configs/pxe-default.conf $RPM_BUILD_ROOT%{_tftpdir}/ltsp/x86_64/pxelinux.cfg/default-install -m 0644 /usr/lib/syslinux/pxelinux.0 $RPM_BUILD_ROOT%{_tftpdir}/ltsp/i386-install -m 0644 /usr/lib/syslinux/pxelinux.0 $RPM_BUILD_ROOT%{_tftpdir}/ltsp/x86_64+ %if 0%{?suse_version}+ install -m 0644 /usr/share/syslinux/pxelinux.0 $RPM_BUILD_ROOT%{_tftpdir}/ltsp/i386+ install -m 0644 /usr/share/syslinux/pxelinux.0 $RPM_BUILD_ROOT%{_tftpdir}/ltsp/x86_64+ %else+ install -m 0644 /usr/lib/syslinux/pxelinux.0 $RPM_BUILD_ROOT%{_tftpdir}/ltsp/i386+ install -m 0644 /usr/lib/syslinux/pxelinux.0 $RPM_BUILD_ROOT%{_tftpdir}/ltsp/x86_64+ %endif %endif -%ifarch i386 x86_64+%ifarch %ix86 x86_64 # vmclient install -m 0755 vmclient/ltsp-vmclient $RPM_BUILD_ROOT%{_sbindir}/ install -m 0755 vmclient/ltsp-qemu-bridge-ifup $RPM_BUILD_ROOT%{_sbindir}/@@ -219,7 +235,7 @@ %dir %{_tftpdir}/ltsp/x86_64/pxelinux.cfg/ %dir %{_tftpdir}/ltsp/ppc/ %dir %{_tftpdir}/ltsp/ppc64/-%ifarch i386 x86_64+%ifarch %ix86 x86_64 %{_tftpdir}/ltsp/i386/pxelinux.0 %{_tftpdir}/ltsp/x86_64/pxelinux.0 %config(noreplace) %{_tftpdir}/ltsp/i386/pxelinux.cfg/default@@ -263,13 +279,9 @@ %config(noreplace) %{_sysconfdir}/ltsp/kickstart/*/*/*.ks %dir %{_sysconfdir}/ltsp/mkinitrd/ %config(noreplace) %{_sysconfdir}/ltsp/mkinitrd/*-%config(noreplace)%{_tftpdir}/ltsp/i386/lts.conf-%config(noreplace)%{_tftpdir}/ltsp/x86_64/lts.conf-%config(noreplace)%{_tftpdir}/ltsp/ppc/lts.conf-%config(noreplace)%{_tftpdir}/ltsp/ppc64/lts.conf---%ifarch i386 x86_64+%config(noreplace)%{_tftpdir}/ltsp/*/lts.conf++%ifarch %ix86 x86_64 %files vmclient %{_sbindir}/ltsp-vmclient %{_sbindir}/ltsp-qemu-bridge-ifup