rpms/ldm/devel .cvsignore, 1.7, 1.8 ldm-rearrange-stuff.patch, 1.1, 1.2 ldm.spec, 1.14, 1.15 sources, 1.11, 1.12
Warren Togami 砥上勇
wtogami at fedoraproject.org
Fri Oct 31 04:30:53 UTC 2008
Author: wtogami
Update of /cvs/pkgs/rpms/ldm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18281
Modified Files:
.cvsignore ldm-rearrange-stuff.patch ldm.spec sources
Log Message:
- ldminfod tells LDM client location of Xsession script
fallback to client's known location if ldminfod failed to tell it
- ldminfod moved from ltsp-server to ldminfod package
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ldm/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 12 Oct 2008 16:20:40 -0000 1.7
+++ .cvsignore 31 Oct 2008 04:30:22 -0000 1.8
@@ -1,2 +1,2 @@
-ldm-2.0.13.tar.bz2
ldm-k12linux-theme-1.0.1.tar.bz2
+ldm-2.0.15.tar.bz2
ldm-rearrange-stuff.patch:
Index: ldm-rearrange-stuff.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ldm/devel/ldm-rearrange-stuff.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ldm-rearrange-stuff.patch 12 Oct 2008 16:24:02 -0000 1.1
+++ ldm-rearrange-stuff.patch 31 Oct 2008 04:30:22 -0000 1.2
@@ -1,7 +1,7 @@
-=== modified file 'gtkgreet/greeter.c'
---- gtkgreet/greeter.c 2008-10-03 03:50:48 +0000
-+++ gtkgreet/greeter.c 2008-10-12 10:00:46 +0000
-@@ -86,12 +86,12 @@
+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
+@@ -87,12 +87,12 @@
// use 12 hour clock format if LDM_12HOURCLOCK is set to true
if (ldm_getenv_bool("LDM_12HOURCLOCK")) {
@@ -16,8 +16,8 @@
timePtr->tm_hour, timePtr->tm_min);
}
-@@ -375,8 +375,8 @@
- gint lh;
+@@ -329,8 +329,8 @@
+ gint lw, lh;
GdkCursor *normcursor, *busycursor;
- GtkWidget *window, *syslabel, *logo, *EntryBox, *timelabel;
@@ -27,7 +27,7 @@
GtkWidget *timeoutspacer1, *timeoutspacer2, *timeoutlabel;
GtkWidget *entryspacer1, *entryspacer2;
GtkButton *optionbutton, *cancelbutton;
-@@ -384,8 +384,10 @@
+@@ -338,8 +338,10 @@
GdkPixbuf *rawpic, *pix;
GdkPixmap *pic;
GdkBitmap *mask;
@@ -39,7 +39,7 @@
char * ldm_theme;
-@@ -439,6 +441,12 @@
+@@ -393,6 +395,12 @@
h = height;
logo = gtk_image_new_from_file(ldm_theme_file("/logo.png"));
@@ -51,8 +51,8 @@
+ has_bottom_right_image=FALSE;
pix = gtk_image_get_pixbuf((GtkImage *) logo);
- lh = gdk_pixbuf_get_height(pix);
-@@ -461,7 +469,8 @@
+ lw = gdk_pixbuf_get_width(pix);
+@@ -416,7 +424,8 @@
EntryBox = gtk_hbox_new(FALSE, 5);
hbox = gtk_hbox_new(FALSE, 0);
@@ -62,7 +62,7 @@
optionbutton =
(GtkButton *) gtk_button_new_from_stock("gtk-preferences");
-@@ -486,20 +495,32 @@
+@@ -441,20 +450,32 @@
syslabel = gtk_label_new("");
timelabel = gtk_label_new("");
hoststring =
@@ -102,7 +102,7 @@
UserPrompt = gtk_label_new("");
spacer = gtk_label_new("");
-@@ -545,6 +566,15 @@
+@@ -507,6 +528,15 @@
gtk_box_pack_start(GTK_BOX(EntryBox), entry, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(EntryBox), entryspacer2, TRUE, FALSE, 0);
@@ -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);
-@@ -553,14 +583,10 @@
+@@ -515,14 +545,10 @@
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);
@@ -134,4 +134,3 @@
/*
* Start listening to stdin
*/
-
Index: ldm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ldm/devel/ldm.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ldm.spec 12 Oct 2008 23:50:13 -0000 1.14
+++ ldm.spec 31 Oct 2008 04:30:22 -0000 1.15
@@ -1,8 +1,8 @@
Name: ldm
-Version: 2.0.13
-%define _datestamp .20080911.15
-#Release: 7%{_datestamp}%{?dist}
-Release: 3%{?dist}
+Version: 2.0.15
+%define _datestamp .20081030.15
+#Release: 4%{_datestamp}%{?dist}
+Release: 1%{?dist}
Summary: LTSP Display Manager
Group: User Interface/X
@@ -24,9 +24,17 @@
%description
LTSP Display Manager handles network logins for remote desktop sessions.
+%package -n ldminfod
+Summary: LTSP client
+Group: User Interface/X
+Requires: openssh-server
+
+%description -n ldminfod
+Provides Linux Terminal Server capabilities to the LDM client.
+
%prep
%setup -q
-%patch0 -p0
+%patch0 -p1
%build
@@ -47,6 +55,10 @@
%find_lang ldm
+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
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -60,7 +72,16 @@
%{_datadir}/ltsp/screen.d/ldm
%dir %{_localstatedir}/run/ldm/
+%files -n ldminfod
+%{_sbindir}/ldminfod
+%config(noreplace) %{_sysconfdir}/xinetd.d/ldminfod
+
%changelog
+* Fri Oct 31 2008 Warren Togami <wtogami at redhat.com> - 2.0.15-1
+- ldminfod tells LDM client location of Xsession script
+ fallback to client's known location if ldminfod failed to tell it
+- ldminfod moved from ltsp-server to ldminfod package
+
* Sun Oct 12 2008 Warren Togami <wtogami at redhat.com> - 2.0.13-3
- 2.0.13
- K12Linux theme by Maureen Duffy
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ldm/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 12 Oct 2008 16:20:40 -0000 1.11
+++ sources 31 Oct 2008 04:30:22 -0000 1.12
@@ -1,2 +1,2 @@
-04cf63c329fc5ee9ebcc9326ce799c0f ldm-2.0.13.tar.bz2
5b2cbbad73c92f47c65733ff181705cc ldm-k12linux-theme-1.0.1.tar.bz2
+c355c2c1ce93425e0b87f27c8c9042ac ldm-2.0.15.tar.bz2
More information about the fedora-extras-commits
mailing list