[ldm/el6] Update 5.4.5, first rhel testing release.

[Joshua Trimm]

commit de31f353157d8d9cce768ece4ba2fa7645cc124f
Author: Joshua Trimm <enslaver at enslaver.com>
Date:   Thu Feb 28 03:46:57 2013 -0600

    Update 5.4.5, first rhel testing release.

 ldm.spec |   36 +++++++++++++++---------------------
 sources  |    3 +--
 2 files changed, 16 insertions(+), 23 deletions(-)
---
diff --git a/ldm.spec b/ldm.spec
index f0ff76f..5ce6515 100644
--- a/ldm.spec
+++ b/ldm.spec
@@ -1,22 +1,17 @@
 Name:           ldm
-Version:        2.2.4
-%define _datestamp .20110728.16
-#Release:        2%{_datestamp}%{?dist}
-Release:        1%{?dist}
+Version:        2.2.11
+%define _datestamp .20130228.03
+Release:        2%{_datestamp}%{?dist}
+#Release:        1%{?dist}
 Summary:        LTSP Display Manager
 
 Group:          User Interface/X
 License:        GPLv2+
 URL:            https://code.launchpad.net/~ltsp-upstream/ltsp/ldm-trunk
 Source0:        ldm-%{version}.tar.bz2
-# Artwork by Maureen Duffy <duffy at redhat.com>
-%define theme_version 1.0.2
-Source1:        k12linux-theme-%{theme_version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel
-# glib2 2.22+ needed for g_tree_ref
-BuildRequires:  glib2-devel >= 2.22
 BuildRequires:  gettext-devel
 BuildRequires:  intltool
 BuildRequires:  iso-codes
@@ -41,9 +36,8 @@ Provides Linux Terminal Server capabilities to the LDM client.
 
 
 %build
-export CFLAGS="$RPM_OPT_FLAGS"
-## FIXME: K12Linux Layout is currently broken
-#export CFLAGS="$RPM_OPT_FLAGS -DK12LINUX"
+#export CFLAGS="$RPM_OPT_FLAGS"
+export CFLAGS="$RPM_OPT_FLAGS -DCLOVER"
 %configure --disable-dependency-tracking
 make %{?_smp_mflags}
 
@@ -51,13 +45,6 @@ make %{?_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-cd $RPM_BUILD_ROOT/%{_datadir}/ldm/themes
-    tar xfvj %SOURCE1
-    mv k12linux-theme-%{theme_version} k12linux
-## 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/
 
@@ -65,7 +52,11 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/ldm/
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/
 install -m 0755 ldminfod/ldminfod $RPM_BUILD_ROOT%{_sbindir}/ldminfod
+install -m 0755 gtkgreet/ldmgtkgreet $RPM_BUILD_ROOT%{_libexecdir}/ldm/
+install -m 0755 wwm/wwm $RPM_BUILD_ROOT%{_libexecdir}/ldm/
+install -m 0755 ltsp-cluster-info/ltsp-cluster-info $RPM_BUILD_ROOT%{_bindir}/ltsp-cluster-info
 install -m 0644 ldminfod/xinetd.d/ldminfod $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/ldminfod
+install -m 0755 share/ldm-script $RPM_BUILD_ROOT%{_datadir}/ldm/ldm-script
 
 #rm -rf $RPM_BUILD_ROOT%{_datadir}/ldm/themes/ltsp
 ln -s ltsp default
@@ -89,12 +80,15 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-) 
 %doc COPYING README
 %{_bindir}/ldm-dialog
+%{_bindir}/ltsp-cluster-info
 %{_sbindir}/ldm
-%{_libexecdir}/ldm/
+%{_libexecdir}/ldm
+%{_libexecdir}/ldm/ldmgtkgreet
 %{_datadir}/ldm/
+%{_datadir}/ldm/ldm-script
 %{_mandir}/man1/ldm.1.gz
 %{_datadir}/ltsp/screen.d/ldm
-%{_libdir}/ldm/
+%{_libdir}/ldm
 %dir %{_localstatedir}/run/ldm/
 
 %files -n ldminfod
diff --git a/sources b/sources
index 2cb78d5..e2bd369 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-620e0ae9f5db3c40ade7e17681b97a08  k12linux-theme-1.0.2.tar.bz2
-33bbf9f8aa5678ab0f0ad5bc889cd093  ldm-2.0.46.tar.bz2
+bc19fd572a98c851da125431b3a244bd  ldm-2.2.11.tar.bz2