This commit is contained in:
parent
fb8c0af41c
commit
1f27bfc9fd
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:d2ee2c552282aa56b4e2c0797052b33a44b5d7bba6f203f44b2c9eaa17e1ba19
|
|
||||||
size 2616227
|
|
3
gdm-2.26.0.tar.bz2
Normal file
3
gdm-2.26.0.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:34b9e36eaaa004f47b3e67924537cba1bdfe6ae467d8f0d30028ae7e6ef34627
|
||||||
|
size 2552457
|
@ -1,105 +0,0 @@
|
|||||||
Index: gdm-2.24.0/data/gdm.conf.in
|
|
||||||
===================================================================
|
|
||||||
--- gdm-2.24.0.orig/data/gdm.conf.in
|
|
||||||
+++ gdm-2.24.0/data/gdm.conf.in
|
|
||||||
@@ -7,52 +7,76 @@
|
|
||||||
<policy user="root">
|
|
||||||
<allow own="org.gnome.DisplayManager"/>
|
|
||||||
|
|
||||||
- <allow send_interface="org.gnome.DisplayManager.Manager"/>
|
|
||||||
- <allow send_interface="org.gnome.DisplayManager.Display"/>
|
|
||||||
- <allow send_interface="org.gnome.DisplayManager.LocalDisplayFactory"/>
|
|
||||||
- <allow send_interface="org.gnome.DisplayManager.Settings"/>
|
|
||||||
- <allow send_interface="org.gnome.DisplayManager.Slave"/>
|
|
||||||
- <allow send_interface="org.gnome.DisplayManager.Session"/>
|
|
||||||
+ <allow send_destination="org.gnome.DisplayManager"
|
|
||||||
+ send_interface="org.gnome.DisplayManager.Manager"/>
|
|
||||||
+ <allow send_destination="org.gnome.DisplayManager"
|
|
||||||
+ send_interface="org.gnome.DisplayManager.Display"/>
|
|
||||||
+ <allow send_destination="org.gnome.DisplayManager"
|
|
||||||
+ send_interface="org.gnome.DisplayManager.LocalDisplayFactory"/>
|
|
||||||
+ <allow send_destination="org.gnome.DisplayManager"
|
|
||||||
+ send_interface="org.gnome.DisplayManager.Settings"/>
|
|
||||||
+ <allow send_destination="org.gnome.DisplayManager"
|
|
||||||
+ send_interface="org.gnome.DisplayManager.Slave"/>
|
|
||||||
+ <allow send_destination="org.gnome.DisplayManager"
|
|
||||||
+ send_interface="org.gnome.DisplayManager.Session"/>
|
|
||||||
<allow send_destination="org.gnome.DisplayManager"
|
|
||||||
send_interface="org.gnome.DBus.Properties" />
|
|
||||||
</policy>
|
|
||||||
|
|
||||||
<policy context="default">
|
|
||||||
- <deny send_interface="org.gnome.DisplayManager.Manager"/>
|
|
||||||
- <deny send_interface="org.gnome.DisplayManager.Display"/>
|
|
||||||
- <deny send_interface="org.gnome.DisplayManager.LocalDisplayFactory"/>
|
|
||||||
- <deny send_interface="org.gnome.DisplayManager.Settings"/>
|
|
||||||
- <deny send_interface="org.gnome.DisplayManager.Slave"/>
|
|
||||||
- <deny send_interface="org.gnome.DisplayManager.Session"/>
|
|
||||||
+ <deny send_destination="org.gnome.DisplayManager"
|
|
||||||
+ send_interface="org.gnome.DisplayManager.Manager"/>
|
|
||||||
+ <deny send_destination="org.gnome.DisplayManager"
|
|
||||||
+ send_interface="org.gnome.DisplayManager.Display"/>
|
|
||||||
+ <deny send_destination="org.gnome.DisplayManager"
|
|
||||||
+ send_interface="org.gnome.DisplayManager.LocalDisplayFactory"/>
|
|
||||||
+ <deny send_destination="org.gnome.DisplayManager"
|
|
||||||
+ send_interface="org.gnome.DisplayManager.Settings"/>
|
|
||||||
+ <deny send_destination="org.gnome.DisplayManager"
|
|
||||||
+ send_interface="org.gnome.DisplayManager.Slave"/>
|
|
||||||
+ <deny send_destination="org.gnome.DisplayManager"
|
|
||||||
+ send_interface="org.gnome.DisplayManager.Session"/>
|
|
||||||
<deny send_destination="org.gnome.DisplayManager"
|
|
||||||
send_interface="org.gnome.DBus.Properties" />
|
|
||||||
|
|
||||||
- <allow send_interface="org.gnome.DisplayManager.Display"
|
|
||||||
+ <allow send_destination="org.gnome.DisplayManager"
|
|
||||||
+ send_interface="org.gnome.DisplayManager.Display"
|
|
||||||
send_member="GetId"/>
|
|
||||||
- <allow send_interface="org.gnome.DisplayManager.Display"
|
|
||||||
+ <allow send_destination="org.gnome.DisplayManager"
|
|
||||||
+ send_interface="org.gnome.DisplayManager.Display"
|
|
||||||
send_member="GetRemoteHostname"/>
|
|
||||||
- <allow send_interface="org.gnome.DisplayManager.Display"
|
|
||||||
+ <allow send_destination="org.gnome.DisplayManager"
|
|
||||||
+ send_interface="org.gnome.DisplayManager.Display"
|
|
||||||
send_member="GetSeatId"/>
|
|
||||||
- <allow send_interface="org.gnome.DisplayManager.Display"
|
|
||||||
+ <allow send_destination="org.gnome.DisplayManager"
|
|
||||||
+ send_interface="org.gnome.DisplayManager.Display"
|
|
||||||
send_member="GetX11DisplayName"/>
|
|
||||||
- <allow send_interface="org.gnome.DisplayManager.Display"
|
|
||||||
+ <allow send_destination="org.gnome.DisplayManager"
|
|
||||||
+ send_interface="org.gnome.DisplayManager.Display"
|
|
||||||
send_member="GetX11DisplayNumber"/>
|
|
||||||
- <allow send_interface="org.gnome.DisplayManager.Display"
|
|
||||||
+ <allow send_destination="org.gnome.DisplayManager"
|
|
||||||
+ send_interface="org.gnome.DisplayManager.Display"
|
|
||||||
send_member="IsLocal"/>
|
|
||||||
|
|
||||||
- <allow send_interface="org.gnome.DisplayManager.LocalDisplayFactory"
|
|
||||||
+ <allow send_destination="org.gnome.DisplayManager"
|
|
||||||
+ send_interface="org.gnome.DisplayManager.LocalDisplayFactory"
|
|
||||||
send_member="CreateTransientDisplay"/>
|
|
||||||
|
|
||||||
- <allow send_interface="org.gnome.DisplayManager.Manager"
|
|
||||||
+ <allow send_destination="org.gnome.DisplayManager"
|
|
||||||
+ send_interface="org.gnome.DisplayManager.Manager"
|
|
||||||
send_member="GetDisplays"/>
|
|
||||||
|
|
||||||
</policy>
|
|
||||||
|
|
||||||
<policy user="@GDM_USERNAME@">
|
|
||||||
- <allow send_interface="org.gnome.DisplayManager.Manager"/>
|
|
||||||
- <allow send_interface="org.gnome.DisplayManager.Display"/>
|
|
||||||
- <allow send_interface="org.gnome.DisplayManager.LocalDisplayFactory"/>
|
|
||||||
- <allow send_interface="org.gnome.DisplayManager.Settings"/>
|
|
||||||
+ <allow send_destination="org.gnome.DisplayManager"
|
|
||||||
+ send_interface="org.gnome.DisplayManager.Manager"/>
|
|
||||||
+ <allow send_destination="org.gnome.DisplayManager"
|
|
||||||
+ send_interface="org.gnome.DisplayManager.Display"/>
|
|
||||||
+ <allow send_destination="org.gnome.DisplayManager"
|
|
||||||
+ send_interface="org.gnome.DisplayManager.LocalDisplayFactory"/>
|
|
||||||
+ <allow send_destination="org.gnome.DisplayManager"
|
|
||||||
+ send_interface="org.gnome.DisplayManager.Settings"/>
|
|
||||||
<allow send_destination="org.gnome.DisplayManager"
|
|
||||||
send_interface="org.gnome.DBus.Properties" />
|
|
||||||
</policy>
|
|
@ -1,63 +0,0 @@
|
|||||||
--- trunk/gui/simple-greeter/gdm-greeter-login-window.c 2008/11/18 22:18:29 6599
|
|
||||||
+++ trunk/gui/simple-greeter/gdm-greeter-login-window.c 2009/01/14 22:59:37 6662
|
|
||||||
@@ -543,7 +543,6 @@
|
|
||||||
|
|
||||||
switch (number) {
|
|
||||||
case MODE_SELECTION:
|
|
||||||
- gtk_widget_set_size_request (GTK_WIDGET (login_window), -1, -1);
|
|
||||||
set_log_in_button_mode (login_window, LOGIN_BUTTON_HIDDEN);
|
|
||||||
|
|
||||||
show_widget (login_window, "cancel-button", FALSE);
|
|
||||||
@@ -568,9 +567,6 @@
|
|
||||||
default_name = NULL;
|
|
||||||
break;
|
|
||||||
case MODE_AUTHENTICATION:
|
|
||||||
- gtk_widget_set_size_request (GTK_WIDGET (login_window),
|
|
||||||
- GTK_WIDGET (login_window)->allocation.width,
|
|
||||||
- -1);
|
|
||||||
show_widget (login_window, "cancel-button", TRUE);
|
|
||||||
show_widget (login_window, "shutdown-button", FALSE);
|
|
||||||
show_widget (login_window, "restart-button", FALSE);
|
|
||||||
@@ -1656,16 +1652,22 @@
|
|
||||||
gdm_greeter_login_window_size_request (GtkWidget *widget,
|
|
||||||
GtkRequisition *requisition)
|
|
||||||
{
|
|
||||||
- int screen_w;
|
|
||||||
- int screen_h;
|
|
||||||
- GtkRequisition child_requisition;
|
|
||||||
+ int monitor;
|
|
||||||
+ GdkScreen *screen;
|
|
||||||
+ GtkRequisition child_requisition;
|
|
||||||
+ GdkRectangle area;
|
|
||||||
|
|
||||||
if (GTK_WIDGET_CLASS (gdm_greeter_login_window_parent_class)->size_request) {
|
|
||||||
GTK_WIDGET_CLASS (gdm_greeter_login_window_parent_class)->size_request (widget, requisition);
|
|
||||||
}
|
|
||||||
|
|
||||||
- screen_w = gdk_screen_get_width (gtk_widget_get_screen (widget));
|
|
||||||
- screen_h = gdk_screen_get_height (gtk_widget_get_screen (widget));
|
|
||||||
+ if (!GTK_WIDGET_REALIZED (widget)) {
|
|
||||||
+ return;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ screen = gtk_widget_get_screen (widget);
|
|
||||||
+ monitor = gdk_screen_get_monitor_at_window (screen, widget->window);
|
|
||||||
+ gdk_screen_get_monitor_geometry (screen, monitor, &area);
|
|
||||||
|
|
||||||
gtk_widget_get_child_requisition (GTK_BIN (widget)->child, &child_requisition);
|
|
||||||
*requisition = child_requisition;
|
|
||||||
@@ -1676,8 +1678,12 @@
|
|
||||||
/* Make width be at least 33% screen width
|
|
||||||
* and height be at most 80% of screen height
|
|
||||||
*/
|
|
||||||
- requisition->width = MAX (requisition->width, .33 * screen_w);
|
|
||||||
- requisition->height = MIN (requisition->height, .80 * screen_h);
|
|
||||||
+ requisition->width = MAX (requisition->width, .33 * area.width);
|
|
||||||
+ requisition->height = MIN (requisition->height, .80 * area.height);
|
|
||||||
+
|
|
||||||
+ /* Don't ever shrink window width
|
|
||||||
+ */
|
|
||||||
+ requisition->width = MAX (requisition->width, widget->allocation.width);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
@ -1,8 +1,8 @@
|
|||||||
diff --git a/gui/simple-greeter/gdm-greeter-panel.c b/gui/simple-greeter/gdm-greeter-panel.c
|
Index: gdm-2.25.92/gui/simple-greeter/gdm-greeter-panel.c
|
||||||
index e557ba9..c3e1c9b 100644
|
===================================================================
|
||||||
--- a/gui/simple-greeter/gdm-greeter-panel.c
|
--- gdm-2.25.92.orig/gui/simple-greeter/gdm-greeter-panel.c
|
||||||
+++ b/gui/simple-greeter/gdm-greeter-panel.c
|
+++ gdm-2.25.92/gui/simple-greeter/gdm-greeter-panel.c
|
||||||
@@ -557,6 +557,7 @@ gdm_greeter_panel_init (GdmGreeterPanel *panel)
|
@@ -571,6 +571,7 @@ gdm_greeter_panel_init (GdmGreeterPanel
|
||||||
{
|
{
|
||||||
NaTray *tray;
|
NaTray *tray;
|
||||||
GtkWidget *spacer;
|
GtkWidget *spacer;
|
||||||
@ -10,7 +10,7 @@ index e557ba9..c3e1c9b 100644
|
|||||||
|
|
||||||
gdm_profile_start (NULL);
|
gdm_profile_start (NULL);
|
||||||
|
|
||||||
@@ -634,7 +635,15 @@ gdm_greeter_panel_init (GdmGreeterPanel *panel)
|
@@ -648,7 +649,15 @@ gdm_greeter_panel_init (GdmGreeterPanel
|
||||||
panel->priv->clock = gdm_clock_widget_new ();
|
panel->priv->clock = gdm_clock_widget_new ();
|
||||||
gtk_box_pack_end (GTK_BOX (panel->priv->hbox),
|
gtk_box_pack_end (GTK_BOX (panel->priv->hbox),
|
||||||
GTK_WIDGET (panel->priv->clock), FALSE, FALSE, 6);
|
GTK_WIDGET (panel->priv->clock), FALSE, FALSE, 6);
|
||||||
@ -27,19 +27,17 @@ index e557ba9..c3e1c9b 100644
|
|||||||
|
|
||||||
tray = na_tray_new_for_screen (gtk_window_get_screen (GTK_WINDOW (panel)),
|
tray = na_tray_new_for_screen (gtk_window_get_screen (GTK_WINDOW (panel)),
|
||||||
GTK_ORIENTATION_HORIZONTAL);
|
GTK_ORIENTATION_HORIZONTAL);
|
||||||
diff --git a/gui/simple-greeter/gdm-option-widget.c b/gui/simple-greeter/gdm-option-widget.c
|
Index: gdm-2.25.92/gui/simple-greeter/gdm-option-widget.c
|
||||||
index 5561ce6..d49a375 100644
|
===================================================================
|
||||||
--- a/gui/simple-greeter/gdm-option-widget.c
|
--- gdm-2.25.92.orig/gui/simple-greeter/gdm-option-widget.c
|
||||||
+++ b/gui/simple-greeter/gdm-option-widget.c
|
+++ gdm-2.25.92/gui/simple-greeter/gdm-option-widget.c
|
||||||
@@ -617,8 +617,18 @@ gdm_option_widget_check_visibility (GdmOptionWidget *widget)
|
@@ -618,8 +618,17 @@ gdm_option_widget_check_visibility (GdmO
|
||||||
if (widget->priv->number_of_top_rows > 0 ||
|
(widget->priv->number_of_top_rows > 0 ||
|
||||||
widget->priv->number_of_middle_rows > 1 ||
|
widget->priv->number_of_middle_rows > 1 ||
|
||||||
widget->priv->number_of_bottom_rows > 0) {
|
widget->priv->number_of_bottom_rows > 0)) {
|
||||||
+ GdkScreen *screen;
|
+ GdkScreen *screen;
|
||||||
+
|
|
||||||
gtk_widget_show (widget->priv->items_combo_box);
|
gtk_widget_show (widget->priv->items_combo_box);
|
||||||
- gtk_widget_show (widget->priv->label);
|
- gtk_widget_show (widget->priv->label);
|
||||||
+
|
|
||||||
+ screen = gtk_widget_get_screen (widget->priv->label);
|
+ screen = gtk_widget_get_screen (widget->priv->label);
|
||||||
+ if (!screen)
|
+ if (!screen)
|
||||||
+ screen = gdk_screen_get_default ();
|
+ screen = gdk_screen_get_default ();
|
||||||
@ -48,6 +46,7 @@ index 5561ce6..d49a375 100644
|
|||||||
+
|
+
|
||||||
+ if (!screen || gdk_screen_get_width (screen) > 1280)
|
+ if (!screen || gdk_screen_get_width (screen) > 1280)
|
||||||
+ gtk_widget_show (widget->priv->label);
|
+ gtk_widget_show (widget->priv->label);
|
||||||
|
+
|
||||||
|
|
||||||
if (widget->priv->icon_name != NULL) {
|
if (widget->priv->icon_name != NULL) {
|
||||||
gtk_widget_show (widget->priv->image);
|
gtk_widget_show (widget->priv->image);
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
Index: gdm-2.24.0/data/Init.in
|
Index: gdm-2.25.92/data/Init.in
|
||||||
===================================================================
|
===================================================================
|
||||||
--- gdm-2.24.0.orig/data/Init.in
|
--- gdm-2.25.92.orig/data/Init.in
|
||||||
+++ gdm-2.24.0/data/Init.in
|
+++ gdm-2.25.92/data/Init.in
|
||||||
@@ -1,4 +1,9 @@
|
@@ -1,4 +1,9 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
+
|
+
|
||||||
@ -12,10 +12,10 @@ Index: gdm-2.24.0/data/Init.in
|
|||||||
# Stolen from the debian kdm setup, aren't I sneaky
|
# Stolen from the debian kdm setup, aren't I sneaky
|
||||||
# Plus a lot of fun stuff added
|
# Plus a lot of fun stuff added
|
||||||
# -George
|
# -George
|
||||||
Index: gdm-2.24.0/data/PostSession.in
|
Index: gdm-2.25.92/data/PostSession.in
|
||||||
===================================================================
|
===================================================================
|
||||||
--- gdm-2.24.0.orig/data/PostSession.in
|
--- gdm-2.25.92.orig/data/PostSession.in
|
||||||
+++ gdm-2.24.0/data/PostSession.in
|
+++ gdm-2.25.92/data/PostSession.in
|
||||||
@@ -1,3 +1,7 @@
|
@@ -1,3 +1,7 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
@ -24,11 +24,11 @@ Index: gdm-2.24.0/data/PostSession.in
|
|||||||
+fi
|
+fi
|
||||||
+
|
+
|
||||||
exit 0
|
exit 0
|
||||||
Index: gdm-2.24.0/data/Xsession.in
|
Index: gdm-2.25.92/data/Xsession.in
|
||||||
===================================================================
|
===================================================================
|
||||||
--- gdm-2.24.0.orig/data/Xsession.in
|
--- gdm-2.25.92.orig/data/Xsession.in
|
||||||
+++ gdm-2.24.0/data/Xsession.in
|
+++ gdm-2.25.92/data/Xsession.in
|
||||||
@@ -1,253 +1,6 @@
|
@@ -1,235 +1,6 @@
|
||||||
-#!@XSESSION_SHELL@
|
-#!@XSESSION_SHELL@
|
||||||
-#
|
-#
|
||||||
-# This is SORT OF LIKE an X session, but not quite. You get a command as the
|
-# This is SORT OF LIKE an X session, but not quite. You get a command as the
|
||||||
@ -111,10 +111,7 @@ Index: gdm-2.24.0/data/Xsession.in
|
|||||||
-freetemp=`gdmwhich freetemp`
|
-freetemp=`gdmwhich freetemp`
|
||||||
-if [ -n "$freetemp" ] ; then
|
-if [ -n "$freetemp" ] ; then
|
||||||
- "$freetemp"
|
- "$freetemp"
|
||||||
+if test -f /etc/X11/xdm/Xstartup -a -x /etc/X11/xdm/Xsession; then
|
-fi
|
||||||
+ /bin/bash /etc/X11/xdm/Xstartup
|
|
||||||
+ exec /etc/X11/xdm/Xsession $1 $GDM_LANG
|
|
||||||
fi
|
|
||||||
-
|
-
|
||||||
-userresources="$HOME/.Xresources"
|
-userresources="$HOME/.Xresources"
|
||||||
-usermodmap="$HOME/.Xmodmap"
|
-usermodmap="$HOME/.Xmodmap"
|
||||||
@ -162,7 +159,10 @@ Index: gdm-2.24.0/data/Xsession.in
|
|||||||
- XKB_IN_USE=yes
|
- XKB_IN_USE=yes
|
||||||
- fi
|
- fi
|
||||||
- fi
|
- fi
|
||||||
-fi
|
+if test -f /etc/X11/xdm/Xstartup -a -x /etc/X11/xdm/Xsession; then
|
||||||
|
+ /bin/bash /etc/X11/xdm/Xstartup
|
||||||
|
+ exec /etc/X11/xdm/Xsession $1 $GDM_LANG
|
||||||
|
fi
|
||||||
-
|
-
|
||||||
-# xkb and xmodmap don't play nice together
|
-# xkb and xmodmap don't play nice together
|
||||||
-if [ -z "$XKB_IN_USE" ]; then
|
-if [ -z "$XKB_IN_USE" ]; then
|
||||||
@ -221,24 +221,6 @@ Index: gdm-2.24.0/data/Xsession.in
|
|||||||
- done
|
- done
|
||||||
-fi
|
-fi
|
||||||
-
|
-
|
||||||
-# @DISTRO_XSESSION@
|
|
||||||
-#
|
|
||||||
-# End of Distribution configuration section.
|
|
||||||
-#
|
|
||||||
-
|
|
||||||
-#Startup Input methods (IIIM->XIM)
|
|
||||||
-if [ -f /etc/iiim/xsession ]; then
|
|
||||||
- . /etc/iiim/xsession
|
|
||||||
-fi
|
|
||||||
-#Startup XIM stuff
|
|
||||||
-if [ "x$XMODIFIERS" = "x" ]; then
|
|
||||||
- if [ -f "$HOME/.xim" ]; then
|
|
||||||
- . $HOME/.xim
|
|
||||||
- elif [ -f "/etc/skel/.xim" ]; then
|
|
||||||
- . /etc/skel/.xim
|
|
||||||
- fi
|
|
||||||
-fi
|
|
||||||
-
|
|
||||||
-if [ "x$command" = "xcustom" ] ; then
|
-if [ "x$command" = "xcustom" ] ; then
|
||||||
- if [ -x "$HOME/.xsession" ]; then
|
- if [ -x "$HOME/.xsession" ]; then
|
||||||
- command="$HOME/.xsession"
|
- command="$HOME/.xsession"
|
||||||
|
29
gdm.changes
29
gdm.changes
@ -1,3 +1,32 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Mar 16 22:21:27 CET 2009 - mboman@suse.de
|
||||||
|
|
||||||
|
- Update to version 2.26.0:
|
||||||
|
+ Make xdmcp/PingIntervalSeconds config option work
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Mar 16 14:46:16 CET 2009 - sbrabec@suse.cz
|
||||||
|
|
||||||
|
- Added support for translation-update-upstream (FATE#301344).
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Sat Mar 14 00:55:54 CET 2009 - mboman@suse.de
|
||||||
|
|
||||||
|
- Update to version 2.25.92:
|
||||||
|
+ Hide presence features in user switcher applet
|
||||||
|
+ Make autologin happen more than once after bootup
|
||||||
|
+ Better panel placement and login screen sizing in
|
||||||
|
multihead set ups
|
||||||
|
+ Fix XDMCP and add more XDMCP configurability
|
||||||
|
+ Rework dbus security files to be more correct
|
||||||
|
+ Various other fixes
|
||||||
|
- Remove gdm-login-window-size.patch. Fixed upstream
|
||||||
|
- Remove gdm-bnc468374-dbus-send-dest.patch. Fixed upstream
|
||||||
|
- Update gdm-save-panel-space-on-low-resolutions.patch
|
||||||
|
- Update gdm-suse-xsession.patch
|
||||||
|
- Remove BuildRequires gnome-common, scrollkeeper
|
||||||
|
- Remove custom CFLAGS
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Mar 5 16:24:33 CET 2009 - vuntz@novell.com
|
Thu Mar 5 16:24:33 CET 2009 - vuntz@novell.com
|
||||||
|
|
||||||
|
49
gdm.spec
49
gdm.spec
@ -1,5 +1,5 @@
|
|||||||
#
|
#
|
||||||
# spec file for package gdm (Version 2.25.2)
|
# spec file for package gdm (Version 2.26.0)
|
||||||
#
|
#
|
||||||
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||||
#
|
#
|
||||||
@ -23,7 +23,6 @@ BuildRequires: PolicyKit-gnome-devel
|
|||||||
BuildRequires: check-devel
|
BuildRequires: check-devel
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
BuildRequires: gconf2-devel
|
BuildRequires: gconf2-devel
|
||||||
BuildRequires: gnome-common
|
|
||||||
BuildRequires: gnome-doc-utils-devel
|
BuildRequires: gnome-doc-utils-devel
|
||||||
BuildRequires: gnome-panel-devel
|
BuildRequires: gnome-panel-devel
|
||||||
BuildRequires: gnome-patch-translation
|
BuildRequires: gnome-patch-translation
|
||||||
@ -34,20 +33,16 @@ BuildRequires: libselinux-devel
|
|||||||
BuildRequires: libxklavier-devel
|
BuildRequires: libxklavier-devel
|
||||||
BuildRequires: pam-devel
|
BuildRequires: pam-devel
|
||||||
BuildRequires: pwdutils
|
BuildRequires: pwdutils
|
||||||
BuildRequires: scrollkeeper
|
|
||||||
BuildRequires: tcpd-devel
|
BuildRequires: tcpd-devel
|
||||||
|
BuildRequires: translation-update-upstream
|
||||||
BuildRequires: update-desktop-files
|
BuildRequires: update-desktop-files
|
||||||
BuildRequires: xorg-x11-server
|
BuildRequires: xorg-x11-server
|
||||||
BuildRequires: xorg-x11-server-extra
|
BuildRequires: xorg-x11-server-extra
|
||||||
BuildRequires: zenity
|
BuildRequires: zenity
|
||||||
PreReq: /usr/sbin/groupadd
|
|
||||||
PreReq: /usr/sbin/useradd
|
|
||||||
PreReq: /usr/sbin/usermod
|
|
||||||
PreReq: %insserv_prereq
|
|
||||||
License: GPL v2 or later
|
License: GPL v2 or later
|
||||||
Group: System/GUI/GNOME
|
Group: System/GUI/GNOME
|
||||||
Version: 2.25.2
|
Version: 2.26.0
|
||||||
Release: 3
|
Release: 1
|
||||||
Summary: The GNOME 2.x Display Manager
|
Summary: The GNOME 2.x Display Manager
|
||||||
Source: %{name}-%{version}.tar.bz2
|
Source: %{name}-%{version}.tar.bz2
|
||||||
Source1: gdm.pamd
|
Source1: gdm.pamd
|
||||||
@ -75,8 +70,6 @@ Patch18: gdm-always-reflect-keyboard-layout.patch
|
|||||||
Patch19: gdm-save-panel-space-on-low-resolutions.patch
|
Patch19: gdm-save-panel-space-on-low-resolutions.patch
|
||||||
# PATCH-FIX-UPSTREAM gdm-selecting-desktop-environment.patch bnc460591 mxwu@novell.com -- Selecting the right desktop environment
|
# PATCH-FIX-UPSTREAM gdm-selecting-desktop-environment.patch bnc460591 mxwu@novell.com -- Selecting the right desktop environment
|
||||||
Patch20: gdm-selecting-desktop-environment.patch
|
Patch20: gdm-selecting-desktop-environment.patch
|
||||||
# PATCH-FIX-UPSTREAM gdm-login-window-size.patch vuntz@novell.com -- Patch taken from upstream svn to fix the login window size in some cases. Needed for gdm-hide-lonely-other.patch
|
|
||||||
Patch21: gdm-login-window-size.patch
|
|
||||||
# PATCH-FIX-UPSTREAM gdm-hide-lonely-other.patch bnc439894 bgo568323 vuntz@novell.com -- Hide Other in the user list when there's no user list
|
# PATCH-FIX-UPSTREAM gdm-hide-lonely-other.patch bnc439894 bgo568323 vuntz@novell.com -- Hide Other in the user list when there's no user list
|
||||||
Patch22: gdm-hide-lonely-other.patch
|
Patch22: gdm-hide-lonely-other.patch
|
||||||
# PATCH-FIX-UPSTREAM gdm-accreditation-failed-log.patch vuntz@novell.com -- Better logging for accreditation failed
|
# PATCH-FIX-UPSTREAM gdm-accreditation-failed-log.patch vuntz@novell.com -- Better logging for accreditation failed
|
||||||
@ -88,8 +81,6 @@ Patch25: gdm-propagate-env-to-jobs.patch
|
|||||||
# PATCH-FIX-UPSTREAM gdm-fix-locale-listing.patch bnc446446 vuntz@novell.com -- Fix locale listing so that all locales are listed in the language chooser
|
# PATCH-FIX-UPSTREAM gdm-fix-locale-listing.patch bnc446446 vuntz@novell.com -- Fix locale listing so that all locales are listed in the language chooser
|
||||||
Patch26: gdm-fix-locale-listing.patch
|
Patch26: gdm-fix-locale-listing.patch
|
||||||
Patch28: gdm-X_SERVER.patch
|
Patch28: gdm-X_SERVER.patch
|
||||||
# PATCH-FIX-UPSTREAM gdm-bnc468374-dbus-send-dest.patch bnc468374 bgo564767 vuntz@novell.com -- Patch taken from upstream to fix the potential dbus security issue with send_interface
|
|
||||||
Patch29: gdm-bnc468374-dbus-send-dest.patch
|
|
||||||
# PATCH-FIX-UPSTREAM gdm-dbus-allow-introspection.patch bnc473880 bgo572214 vuntz@novell.com -- Patch by thoenig to allow introspection of the dbus service
|
# PATCH-FIX-UPSTREAM gdm-dbus-allow-introspection.patch bnc473880 bgo572214 vuntz@novell.com -- Patch by thoenig to allow introspection of the dbus service
|
||||||
Patch30: gdm-dbus-allow-introspection.patch
|
Patch30: gdm-dbus-allow-introspection.patch
|
||||||
# PATCH-FIX-OPENSUSE gdm-gconf-path.patch vuntz@novell.com -- Fix gconf paths to be consistent with the ones used in openSUSE
|
# PATCH-FIX-OPENSUSE gdm-gconf-path.patch vuntz@novell.com -- Fix gconf paths to be consistent with the ones used in openSUSE
|
||||||
@ -102,13 +93,17 @@ DocDir: %{_defaultdocdir}
|
|||||||
Provides: gdm2
|
Provides: gdm2
|
||||||
Obsoletes: gdm2
|
Obsoletes: gdm2
|
||||||
Obsoletes: fast-user-switch-applet <= 2.22.0
|
Obsoletes: fast-user-switch-applet <= 2.22.0
|
||||||
|
Requires: %{name}-branding
|
||||||
|
Requires: %{name}-lang = %{version}
|
||||||
Requires: ConsoleKit-x11
|
Requires: ConsoleKit-x11
|
||||||
Requires: gnome-session
|
Requires: gnome-session
|
||||||
Requires: gnome-themes
|
Requires: gnome-themes
|
||||||
Requires: klogd
|
Requires: klogd
|
||||||
Requires: xorg-x11-server-extra
|
Requires: xorg-x11-server-extra
|
||||||
Requires: %{name}-branding
|
PreReq: /usr/sbin/groupadd
|
||||||
Requires: %{name}-lang = %{version}
|
PreReq: /usr/sbin/useradd
|
||||||
|
PreReq: /usr/sbin/usermod
|
||||||
|
PreReq: %insserv_prereq
|
||||||
Recommends: gnome-settings-daemon
|
Recommends: gnome-settings-daemon
|
||||||
%gconf_schemas_prereq
|
%gconf_schemas_prereq
|
||||||
|
|
||||||
@ -155,6 +150,7 @@ Authors:
|
|||||||
%lang_package
|
%lang_package
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
translation-update-upstream
|
||||||
gnome-patch-translation-prepare
|
gnome-patch-translation-prepare
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
%patch2 -p1
|
%patch2 -p1
|
||||||
@ -169,14 +165,12 @@ gnome-patch-translation-prepare
|
|||||||
%patch18 -p1
|
%patch18 -p1
|
||||||
%patch19 -p1
|
%patch19 -p1
|
||||||
%patch20 -p1
|
%patch20 -p1
|
||||||
%patch21 -p1
|
|
||||||
%patch22 -p0
|
%patch22 -p0
|
||||||
%patch23 -p1
|
%patch23 -p1
|
||||||
%patch24 -p1
|
%patch24 -p1
|
||||||
%patch25 -p1
|
%patch25 -p1
|
||||||
%patch26 -p1
|
%patch26 -p1
|
||||||
%patch28
|
%patch28
|
||||||
%patch29 -p1
|
|
||||||
%patch30 -p1
|
%patch30 -p1
|
||||||
%patch31 -p1
|
%patch31 -p1
|
||||||
%patch60
|
%patch60
|
||||||
@ -185,7 +179,6 @@ gnome-patch-translation-update
|
|||||||
%build
|
%build
|
||||||
libtoolize -f -i
|
libtoolize -f -i
|
||||||
autoreconf -f -i
|
autoreconf -f -i
|
||||||
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
|
|
||||||
%configure\
|
%configure\
|
||||||
--libexecdir=%{_prefix}/lib/gdm \
|
--libexecdir=%{_prefix}/lib/gdm \
|
||||||
--localstatedir=%{_localstatedir} \
|
--localstatedir=%{_localstatedir} \
|
||||||
@ -286,6 +279,26 @@ fi
|
|||||||
%files lang -f %{name}.lang
|
%files lang -f %{name}.lang
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Mar 16 2009 mboman@suse.de
|
||||||
|
- Update to version 2.26.0:
|
||||||
|
+ Make xdmcp/PingIntervalSeconds config option work
|
||||||
|
* Mon Mar 16 2009 sbrabec@suse.cz
|
||||||
|
- Added support for translation-update-upstream (FATE#301344).
|
||||||
|
* Sat Mar 14 2009 mboman@suse.de
|
||||||
|
- Update to version 2.25.92:
|
||||||
|
+ Hide presence features in user switcher applet
|
||||||
|
+ Make autologin happen more than once after bootup
|
||||||
|
+ Better panel placement and login screen sizing in
|
||||||
|
multihead set ups
|
||||||
|
+ Fix XDMCP and add more XDMCP configurability
|
||||||
|
+ Rework dbus security files to be more correct
|
||||||
|
+ Various other fixes
|
||||||
|
- Remove gdm-login-window-size.patch. Fixed upstream
|
||||||
|
- Remove gdm-bnc468374-dbus-send-dest.patch. Fixed upstream
|
||||||
|
- Update gdm-save-panel-space-on-low-resolutions.patch
|
||||||
|
- Update gdm-suse-xsession.patch
|
||||||
|
- Remove BuildRequires gnome-common, scrollkeeper
|
||||||
|
- Remove custom CFLAGS
|
||||||
* Thu Mar 05 2009 vuntz@novell.com
|
* Thu Mar 05 2009 vuntz@novell.com
|
||||||
- Add gdm-gconf-path.patch: the system-wide changes done in gconf
|
- Add gdm-gconf-path.patch: the system-wide changes done in gconf
|
||||||
are not in gconf.xml.system, but gconf.xml.defaults.
|
are not in gconf.xml.system, but gconf.xml.defaults.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user