[ldm/el6] Fix language and desktop selection

[Warren Togami]

commit 072a0c58cde394e4a765e0d01732a5e018633ad0
Author: Warren Togami <warren at togami.com>
Date:   Thu Jul 28 16:03:21 2011 -1000

    Fix language and desktop selection

 ldm.spec |   20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 deletions(-)
---
diff --git a/ldm.spec b/ldm.spec
index 994e99a..89de370 100644
--- a/ldm.spec
+++ b/ldm.spec
@@ -1,7 +1,7 @@
 Name:           ldm
-Version:        2.2.3
-%define _datestamp .20110616.17
-#Release:        0%{_datestamp}%{?dist}
+Version:        2.2.4
+%define _datestamp .20110726.14
+#Release:        2%{_datestamp}%{?dist}
 Release:        1%{?dist}
 Summary:        LTSP Display Manager
 
@@ -39,7 +39,9 @@ Provides Linux Terminal Server capabilities to the LDM client.
 
 
 %build
-export CFLAGS="$RPM_OPT_FLAGS -DK12LINUX"
+export CFLAGS="$RPM_OPT_FLAGS"
+## FIXME: K12Linux Layout is currently broken
+#export CFLAGS="$RPM_OPT_FLAGS -DK12LINUX"
 %configure --disable-dependency-tracking
 make %{?_smp_mflags}
 
@@ -50,7 +52,9 @@ make install DESTDIR=$RPM_BUILD_ROOT
 cd $RPM_BUILD_ROOT/%{_datadir}/ldm/themes
     tar xfvj %SOURCE1
     mv k12linux-theme-%{theme_version} k12linux
-    ln -s k12linux default
+## FIXME: K12Linux Layout is currently broken
+#    ln -s k12linux default
+    cp k12linux/logo.png ltsp/logo.png
 cd -
 
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/ldm/
@@ -61,7 +65,8 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/
 install -m 0755 ldminfod/ldminfod $RPM_BUILD_ROOT%{_sbindir}/ldminfod
 install -m 0644 ldminfod/xinetd.d/ldminfod $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/ldminfod
 
-rm -rf $RPM_BUILD_ROOT%{_datadir}/ldm/themes/ltsp
+#rm -rf $RPM_BUILD_ROOT%{_datadir}/ldm/themes/ltsp
+ln -s ltsp default
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ltsp
 cat > $RPM_BUILD_ROOT%{_sysconfdir}/ltsp/ldm-global-dmrc <<EOL
@@ -96,6 +101,9 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/ltsp/ldm-global-dmrc
 
 %changelog
+* Thu Jul 28 2011 Warren Togami <warren at togami.com> - 2.2.4
+- Fix language and desktop selection
+
 * Thu Jun 16 2011 Warren Togami <warren at togami.com> - 2.2.3
 - Fix Fedora/RHEL nc version detection