rpms/ldm/F-9 .cvsignore, 1.16, 1.17 ldm-rearrange-stuff.patch, 1.3, 1.4 ldm.spec, 1.22, 1.23 sources, 1.20, 1.21

[Warren Togami 砥上勇]

Author: wtogami

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

Modified Files:
	.cvsignore ldm-rearrange-stuff.patch ldm.spec sources 
Log Message:
- Fix race condition in a clean way without the ugly hack.
- Improve logging.
- Many little bug fixes and code cleanups.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ldm/F-9/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	31 Oct 2008 21:18:10 -0000	1.16
+++ .cvsignore	13 Nov 2008 15:41:57 -0000	1.17
@@ -1,2 +1,2 @@
-ldm-k12linux-theme-1.0.1.tar.bz2
-ldm-2.0.16.tar.bz2
+ldm-k12linux-theme-1.0.2.tar.bz2
+ldm-2.0.18.tar.bz2

ldm-rearrange-stuff.patch:

Index: ldm-rearrange-stuff.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ldm/F-9/ldm-rearrange-stuff.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ldm-rearrange-stuff.patch	31 Oct 2008 04:23:00 -0000	1.3
+++ ldm-rearrange-stuff.patch	13 Nov 2008 15:41:58 -0000	1.4
@@ -1,6 +1,6 @@
-diff -urN ldm-2.0.14/gtkgreet/greeter.c ldm-2.0.14.new/gtkgreet/greeter.c
---- ldm-2.0.14/gtkgreet/greeter.c	2008-10-30 21:44:58.000000000 -0400
-+++ ldm-2.0.14.new/gtkgreet/greeter.c	2008-10-30 21:54:27.000000000 -0400
+diff -urN ldm-2.0.16/gtkgreet/greeter.c ldm-2.0.16.new/gtkgreet/greeter.c
+--- ldm-2.0.16/gtkgreet/greeter.c	2008-10-31 17:14:05.000000000 -0400
++++ ldm-2.0.16.new/gtkgreet/greeter.c	2008-11-07 18:41:29.000000000 -0500
 @@ -87,12 +87,12 @@
  
      // use 12 hour clock format if LDM_12HOURCLOCK is set to true
@@ -118,7 +118,7 @@
      gtk_box_pack_start(GTK_BOX(vbox), spacer, FALSE, FALSE, spheight);
      gtk_box_pack_start(GTK_BOX(vbox), logo, FALSE, FALSE, 5);
      gtk_box_pack_start(GTK_BOX(vbox), EntryBox, TRUE, FALSE, 0);
-@@ -515,14 +545,10 @@
+@@ -515,13 +545,11 @@
      gtk_box_pack_start(GTK_BOX(vbox), StatusMessages, TRUE, FALSE, 0);
      gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, FALSE, 0);
      gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, FALSE, 0);
@@ -130,7 +130,7 @@
      gtk_widget_show_all(window);
  
 -    gdk_window_set_cursor(root, normcursor);
--
++    gtk_widget_grab_focus(GTK_WIDGET(entry));
+ 
      /*
       * Start listening to stdin
-      */


Index: ldm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ldm/F-9/ldm.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ldm.spec	31 Oct 2008 21:18:10 -0000	1.22
+++ ldm.spec	13 Nov 2008 15:41:58 -0000	1.23
@@ -1,5 +1,5 @@
 Name:           ldm
-Version:        2.0.16
+Version:        2.0.18
 %define _datestamp .20081030.15
 #Release:        2%{_datestamp}%{?dist}
 Release:        1%{?dist}
@@ -10,7 +10,7 @@
 URL:            https://code.launchpad.net/~ltsp-upstream/ltsp/ldm-trunk
 Source0:        ldm-%{version}.tar.bz2
 # Artwork by Maureen Duffy <duffy at redhat.com>
-Source1:        ldm-k12linux-theme-1.0.1.tar.bz2
+Source1:        ldm-k12linux-theme-1.0.2.tar.bz2
 Patch0:         ldm-rearrange-stuff.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -59,6 +59,8 @@
 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
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -77,7 +79,12 @@
 %config(noreplace) %{_sysconfdir}/xinetd.d/ldminfod
 
 %changelog
-* Fri Oct 31 2008 Warren Togami <wtogami at redhat.com. - 2.0.16-1
+* 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.
+- Many little bug fixes and code cleanups.
+
+* Fri Oct 31 2008 Warren Togami <wtogami at redhat.com> - 2.0.16-1
 - UGLY HACK: Workaround race condition where keyboard layout setting would often fail
              because it was being set before X was done initializing.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ldm/F-9/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	31 Oct 2008 21:18:10 -0000	1.20
+++ sources	13 Nov 2008 15:41:58 -0000	1.21
@@ -1,2 +1,2 @@
-5b2cbbad73c92f47c65733ff181705cc  ldm-k12linux-theme-1.0.1.tar.bz2
-31214d1394711340f2c5a6a18f36cc8d  ldm-2.0.16.tar.bz2
+596b03e80cf5d56d954d85a83f5dced2  ldm-k12linux-theme-1.0.2.tar.bz2
+d1549a8969f40456464dc2b39a7c814c  ldm-2.0.18.tar.bz2