rpms/ltsp/F-9 ltsp.spec,1.19,1.20

[Warren Togami 砥上勇 (wtogami)]

Author: wtogami

Update of /cvs/pkgs/rpms/ltsp/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10579

Modified Files:
	ltsp.spec 
Log Message:
- Add some spec conditionals for RHEL5.
  RHEL5 has only ltsp-server.  Client chroot must be
  Fedora 9+, so there is no RHEL5 build of ltsp-client.



Index: ltsp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/F-9/ltsp.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ltsp.spec	16 Jul 2008 20:54:32 -0000	1.19
+++ ltsp.spec	17 Jul 2008 16:35:40 -0000	1.20
@@ -1,8 +1,8 @@
 Name:           ltsp
 Version:        5.1.12
-%define _datestamp .20080716.16
+%define _datestamp .20080717.12
 #Release:        0%{_datestamp}%{?dist}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Linux Terminal Server Project Server and Client
 Group:          User Interface/Desktops
 
@@ -13,7 +13,11 @@
 #   mkdst tar --from-tag=ltsp-%{version}
 Source0:        ltsp-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%if 0%{?fedora} > 7 || 0%{?rhel} > 5
 BuildRequires: popt-devel
+%else
+BuildRequires: popt
+%endif
 BuildRequires: flex bison
 BuildRequires: automake
 BuildRequires: pkgconfig
@@ -34,6 +38,7 @@
 %description
 LTSP client and server
 
+%if 0%{?fedora}
 %package client
 Summary:        LTSP client
 Group:          User Interface/Desktops
@@ -43,12 +48,15 @@
 %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}
 # needed to install client chroots
 Requires:       livecd-tools >= 015
+%endif
 Requires:       tftp-server
 Requires:       ltspfs
 Requires:       dhcp
@@ -92,6 +100,7 @@
 %install
 ##### make directories
 rm -rf $RPM_BUILD_ROOT
+%if 0%{?fedora}
 # client
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 mkdir -p $RPM_BUILD_ROOT%{_sbindir}
@@ -100,6 +109,7 @@
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/ltsp/
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/ltsp/chroot-setup.d/
+%endif
 
 # server
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8
@@ -124,6 +134,7 @@
 mkdir -p $RPM_BUILD_ROOT%{_tftpdir}/ltsp/ppc/
 mkdir -p $RPM_BUILD_ROOT%{_tftpdir}/ltsp/ppc64/
 
+%if 0%{?fedora}
 ###### client install
 pushd client/xrexecd
     make install DESTDIR=$RPM_BUILD_ROOT
@@ -146,13 +157,17 @@
 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
 
 ### server install
 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}
 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/chroot-creator $RPM_BUILD_ROOT%{_sbindir}
 install -m 0755 server/ltsp-swapfile-delete $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/
@@ -165,7 +180,6 @@
 install -m 0644 server/configs/k12linux/mkinitrd/sysconfig-mkinitrd $RPM_BUILD_ROOT%{_sysconfdir}/ltsp/mkinitrd/
 install -m 0644 server/configs/k12linux/mkinitrd/sysconfig-network $RPM_BUILD_ROOT%{_sysconfdir}/ltsp/mkinitrd/
 install -m 0644 server/services/sysconfig-ltsp-dhcpd $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ltsp-dhcpd
-cp -pr server/plugins/* $RPM_BUILD_ROOT%{_datadir}/ltsp/plugins/
 install -m 0755 server/services/ltsp-dhcpd.init $RPM_BUILD_ROOT%{_sysconfdir}/init.d/ltsp-dhcpd
 install -m 0755 server/scripts/k12linux/ltsp-prepare-kernel $RPM_BUILD_ROOT/%{_sbindir}/
 install -m 0755 server/scripts/k12linux/ltsp-server-initialize $RPM_BUILD_ROOT/%{_sbindir}/
@@ -206,8 +220,10 @@
 %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
@@ -228,6 +244,7 @@
     /sbin/service ltsp-dhcpd condrestart >/dev/null 2>&1
 fi
 
+%if 0%{?fedora}
 %files client
 %defattr(-,root,root,-)
 %{_mandir}/man1/getltscfg.1.gz
@@ -251,7 +268,7 @@
 %{_sysconfdir}/rwtab.d/*
 %{_localstatedir}/lib/random-seed
 %config(noreplace) %{_sysconfdir}/lts.conf
-
+%endif
 
 %files server
 %defattr(-,root,root,-)
@@ -275,15 +292,16 @@
 
 %dir /opt/ltsp
 
+%if 0%{?fedora}
 %{_sbindir}/ltsp-build-client
+%{_datadir}/ltsp/plugins/
+%endif
 %{_sbindir}/ltsp-prepare-kernel
 %{_sbindir}/ltsp-server-initialize
 %{_sbindir}/ltsp-update-kernels
 %{_datadir}/ltsp/scripts/
 %{_datadir}/ltsp/scripts.d/
 %{_datadir}/ltsp/chkconfig.d/
-%{_datadir}/ltsp/plugins/
-%{_datadir}/ltsp/ltsp-common-functions
 %{_sbindir}/ldminfod
 %{_sbindir}/ltsp-update-sshkeys
 %{_sbindir}/nbdrootd
@@ -324,6 +342,11 @@
 %endif
 
 %changelog
+* Thu Jul 17 2008 Warren Togami <wtogami at redhat.com> - 5.1.12-2
+- Add some spec conditionals for RHEL5.
+  RHEL5 has only ltsp-server.  Client chroot must be
+  Fedora 9+, so there is no RHEL5 build of ltsp-client.
+
 * Wed Jul 16 2008 Warren Togami <wtogami at redhat.com> - 5.1.12-1
 - Move some chroot setup into ltsp-client %%post so things can be fixed
   by ltsp-client package updates in the future.