rpms/ldm/F-10 .cvsignore, 1.10, 1.11 ldm.spec, 1.17, 1.18 sources, 1.14, 1.15

[Warren Togami 砥上勇]

Author: wtogami

Update of /cvs/pkgs/rpms/ldm/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32703

Modified Files:
	.cvsignore ldm.spec sources 
Log Message:
- Show good names in Session menu
- Use and write to user .dmrc
  It is now possible to set a default session that is not GNOME.
  Set LDM_SYSTEMWIDE_DMRC=/etc/ltsp/ldm-default-dmrc in lts.conf
    and specify your choice in /etc/ltsp/ldm-default-dmrc on the server.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ldm/F-10/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	13 Nov 2008 16:39:21 -0000	1.10
+++ .cvsignore	9 Dec 2008 19:38:12 -0000	1.11
@@ -1,2 +1,2 @@
-ldm-k12linux-theme-1.0.2.tar.bz2
-ldm-2.0.18.tar.bz2
+k12linux-theme-1.0.2.tar.bz2
+ldm-2.0.21.tar.bz2


Index: ldm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ldm/F-10/ldm.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ldm.spec	13 Nov 2008 16:39:21 -0000	1.17
+++ ldm.spec	9 Dec 2008 19:38:12 -0000	1.18
@@ -1,8 +1,8 @@
 Name:           ldm
-Version:        2.0.18
-%define _datestamp .20081030.15
-#Release:        2%{_datestamp}%{?dist}
-Release:        1%{?dist}
+Version:        2.0.21
+%define _datestamp .20081209.14
+Release:        1%{_datestamp}%{?dist}
+#Release:        1%{?dist}
 Summary:        LTSP Display Manager
 
 Group:          User Interface/X
@@ -11,7 +11,7 @@
 Source0:        ldm-%{version}.tar.bz2
 # Artwork by Maureen Duffy <duffy at redhat.com>
 %define theme_version 1.0.2
-Source1:        ldm-k12linux-theme-%{theme_version}.tar.bz2
+Source1:        k12linux-theme-%{theme_version}.tar.bz2
 Patch0:         ldm-rearrange-stuff.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -48,7 +48,7 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 cd $RPM_BUILD_ROOT/%{_datadir}/ldm/themes
     tar xfvj %SOURCE1
-    mv ldm-k12linux-theme-%{theme_version} k12linux
+    mv k12linux-theme-%{theme_version} k12linux
     ln -s k12linux default
 cd -
 
@@ -62,12 +62,25 @@
 
 rm -rf $RPM_BUILD_ROOT%{_datadir}/ldm/themes/ltsp
 
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ltsp
+cat > $RPM_BUILD_ROOT%{_sysconfdir}/ltsp/ldm-dmrc-default <<EOL
+[Desktop]
+#Session=gnome
+#Session=kde
+#Session=xfce4
+#Session=sugar
+#Language=ja_JP.utf8
+#Language=en_US.utf8
+EOL
+chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/ltsp/ldm-dmrc-default
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files -f ldm.lang
 %defattr(-,root,root,-) 
 %doc COPYING README
+%{_bindir}/ldm-question
 %{_sbindir}/ldm
 %{_libexecdir}/ldm/
 %{_datadir}/ldm/
@@ -78,8 +91,16 @@
 %files -n ldminfod
 %{_sbindir}/ldminfod
 %config(noreplace) %{_sysconfdir}/xinetd.d/ldminfod
+%config(noreplace) %{_sysconfdir}/ltsp/ldm-dmrc-default
 
 %changelog
+* Tue Dec 09 2008 Warren Togami <wtogami at redhat.com> - 2.0.21-1
+- Show good names in Session menu
+- Use and write to user .dmrc
+  It is now possible to set a default session that is not GNOME.
+  Set LDM_SYSTEMWIDE_DMRC=/etc/ltsp/ldm-default-dmrc in lts.conf
+    and specify your choice in /etc/ltsp/ldm-default-dmrc on the server.
+
 * Thu Nov 13 2008 Warren Togami <wtogami at redhat.com> - 2.0.18-1
 - Fix race condition in a clean way without the ugly hack.
 - Improve logging.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ldm/F-10/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	13 Nov 2008 16:39:21 -0000	1.14
+++ sources	9 Dec 2008 19:38:12 -0000	1.15
@@ -1,2 +1,2 @@
-596b03e80cf5d56d954d85a83f5dced2  ldm-k12linux-theme-1.0.2.tar.bz2
-d1549a8969f40456464dc2b39a7c814c  ldm-2.0.18.tar.bz2
+620e0ae9f5db3c40ade7e17681b97a08  k12linux-theme-1.0.2.tar.bz2
+1287b4cd169f6b4dce527b3993865c67  ldm-2.0.21.tar.bz2