Hello community,
here is the log from the commit of package gdm
checked in at Fri Oct 13 04:36:39 CEST 2006.
--------
--- GNOME/gdm/gdm.changes 2006-10-03 17:58:52.000000000 +0200
+++ /mounts/work_src_done/STABLE/gdm/gdm.changes 2006-10-12 21:53:43.000000000 +0200
@@ -1,0 +2,8 @@
+Thu Oct 12 21:52:14 CEST 2006 - danw@suse.de
+
+- Remove some dead patches. Rename a few for consistency
+- Update and re-enable gdm-server-timeout.patch
+- Update and re-enable gdm-logdir.patch (#211223)
+- Add gdm-X_SERVER.patch to fix Xorg/Xgl switching
+
+-------------------------------------------------------------------
Old:
----
gdm-gnome-screensaver.patch
gdm-libtool.patch
gdm-support-gdmctl.patch
gdm-timelogin.diff
gdm-ximian-defaults.patch
gdm2-server-timeout.patch
gdmsetup-rootonly.dif
New:
----
gdm-X_SERVER.patch
gdm-gdmsetup-rootonly.patch
gdm-server-timeout.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gdm.spec ++++++
--- /var/tmp/diff_new_pack.IhcftG/_old 2006-10-13 04:36:18.000000000 +0200
+++ /var/tmp/diff_new_pack.IhcftG/_new 2006-10-13 04:36:18.000000000 +0200
@@ -11,7 +11,7 @@
# norootforbuild
Name: gdm
-BuildRequires: gnome-common gnome-doc-utils gnome-patch-translation gnutls-devel intltool kdelibs3-doc libglade2-devel libgnomeprintui-devel libgnomeui-devel librsvg-devel libwnck-devel mDNSResponder-devel pam-devel perl-XML-Parser scrollkeeper tcpd-devel update-desktop-files xorg-x11-server zenity
+BuildRequires: gnome-common gnome-doc-utils-devel gnome-patch-translation gnutls-devel intltool kdelibs3-doc libglade2-devel libgnomeprintui-devel libgnomeui-devel librsvg-devel libwnck-devel mDNSResponder-devel pam-devel perl-XML-Parser scrollkeeper tcpd-devel update-desktop-files xorg-x11-server zenity
%define prefix /opt/gnome
%define sysconfdir /etc%{prefix}
PreReq: /usr/sbin/groupadd
@@ -22,7 +22,7 @@
Group: System/GUI/GNOME
Autoreqprov: on
Version: 2.16.1
-Release: 1
+Release: 3
Summary: The GNOME 2.x Display Manager
Source: %{name}-%{version}.tar.bz2
Source1: gdm.pamd
@@ -31,29 +31,25 @@
Source4: init.earlygdm
Source5: sysconfig.displaymanager-gdm
Patch: gdm-conf.patch
-Patch1: gdm-libtool.patch
Patch2: gdm-bash-profile.patch
Patch3: gdm-language-dialog-size.patch
Patch4: gdm-logdir.patch
Patch5: gdm-xdm-sessions.patch
-Patch6: gdm-ximian-defaults.patch
-Patch8: gdm-support-gdmctl.patch
Patch9: gdm-presession-kde-path.patch
-Patch11: gdm-timelogin.diff
-Patch12: gdmsetup-rootonly.dif
+Patch12: gdm-gdmsetup-rootonly.patch
Patch13: gdm-2.8.0.0-any-hostname-auth.patch
Patch14: gdm-2.8.0.0-list-users.patch
Patch15: gdm-2.8.0.0-setup-no-flicker.patch
Patch16: gdm-2.8.0.0-timed-login-enact.patch
-Patch18: gdm-gnome-screensaver.patch
Patch19: gdm-2.8.0.7-bg-4.patch
Patch20: gdm-2.8.0.7-domain-entry.patch
Patch21: gdm-2.8.0.7-halt-needs-root.patch
Patch22: gdm-2.8.0.7-onlyshow-in-gnome.diff
-Patch24: gdm2-server-timeout.patch
+Patch24: gdm-server-timeout.patch
Patch25: gdm-2.8.0.7-user-must-own-iceauthority.patch
Patch26: gdm-2.8.0.7-some-info-in-dialog.patch
Patch27: gdm-autobuild-warning.patch
+Patch28: gdm-X_SERVER.patch
URL: http://www.gnome.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}
@@ -79,27 +75,16 @@
%setup
gnome-patch-translation-prepare
%patch -p1
-#%patch1
#%patch2 -p1
%patch3 -p1
-#%patch4
+%patch4
%patch5 -p1
-# Uncomment patch6 for Ximian branding.
-#%patch6 -p1
-#%patch8 -p1
%patch9 -p1
-#%patch12 -p1
+%patch12
%patch13 -p1
%patch14 -p1
#%patch15 -p1
#%patch16 -p1
-# Create UTF-8 as alternative for all locales.
-#sed 's:\([^ ]*\)\([ ][ ]*\)\(.*\)UTF-8,\(.*\):\1 \2\4,\3UTF-8\
-#\1(UTF-8)\2\3UTF-8,\4:g' config/locale.alias~
-#mv config/locale.alias~ config/locale.alias
-# Prefer non UTF-8 for all locales.
-#sed 's:\([^ ]*\)\([ ][ ]*\)\(.*\)UTF-8,\(.*\):\1 \2\4,\3UTF-8:g' config/locale.alias~
-#mv config/locale.alias~ config/locale.alias
%patch19 -p1
%if %suse_version > 1000
# Uncomment gnome-patch-translation-update after uncommention of patches 20 and 21!
@@ -107,14 +92,12 @@
#%patch21 -p1
%endif
%patch22 -p1
-#%patch24
+%patch24
#%patch25 -p1
%patch26 -p1
%patch27
+%patch28
#gnome-patch-translation-update
-# This patch has its own translation updater.
-#%patch18
-sed -i s/xscreensaver/gnome-screensaver/g po/*.po docs/*/gdm.xml
%build
libtoolize --force
@@ -124,7 +107,6 @@
export ac_aux_dir=$RPM_BUILD_DIR/gdm-%{version}
CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing " \
LDFLAGS=-L/usr/%_lib \
-EXPANDED_LOGDIR=/var/log/gdm \
./configure \
--prefix=%prefix \
--libdir=%prefix/%_lib \
@@ -244,6 +226,11 @@
%dir /usr/share/xsessions
%changelog -n gdm
+* Thu Oct 12 2006 - danw@suse.de
+- Remove some dead patches. Rename a few for consistency
+- Update and re-enable gdm-server-timeout.patch
+- Update and re-enable gdm-logdir.patch (#211223)
+- Add gdm-X_SERVER.patch to fix Xorg/Xgl switching
* Tue Oct 03 2006 - jhargadon@suse.de
- update to version 2.16.1
- Use g_markup_printf_escaped so gdmsetup better handles
++++++ gdm-2.8.0.0-any-hostname-auth.patch ++++++
--- /var/tmp/diff_new_pack.IhcftG/_old 2006-10-13 04:36:19.000000000 +0200
+++ /var/tmp/diff_new_pack.IhcftG/_new 2006-10-13 04:36:19.000000000 +0200
@@ -1,9 +1,8 @@
-diff -upr gdm-2.8.0.4/daemon/slave.c gdm-2.8.0.4-new/daemon/slave.c
---- gdm-2.8.0.4/daemon/slave.c 2005-08-20 13:39:33.000000000 -0500
-+++ gdm-2.8.0.4-new/daemon/slave.c 2005-10-13 18:38:49.000000000 -0500
-@@ -3701,6 +3701,12 @@ session_child_run (struct passwd *pwent,
- ve_setenv ("SHELL", pwent->pw_shell, TRUE);
- ve_unsetenv ("MAIL"); /* Unset $MAIL for broken shells */
+--- gdm-2.16.1/daemon/slave.c
++++ gdm-2.16.1/daemon/slave.c
+@@ -3438,6 +3438,12 @@
+ g_setenv ("SHELL", pwent->pw_shell, TRUE);
+ g_unsetenv ("MAIL"); /* Unset $MAIL for broken shells */
+ if (d->hostname != NULL && d->hostname [0] != '\0') {
+ ve_setenv ("XAUTHLOCALHOSTNAME", d->hostname, TRUE);
@@ -12,5 +11,5 @@
+ }
+
if (d->type == TYPE_STATIC) {
- ve_setenv ("GDM_XSERVER_LOCATION", "local", TRUE);
+ g_setenv ("GDM_XSERVER_LOCATION", "local", TRUE);
} else if (d->type == TYPE_XDMCP) {
++++++ gdm-2.8.0.0-list-users.patch ++++++
--- /var/tmp/diff_new_pack.IhcftG/_old 2006-10-13 04:36:19.000000000 +0200
+++ /var/tmp/diff_new_pack.IhcftG/_new 2006-10-13 04:36:19.000000000 +0200
@@ -1,6 +1,6 @@
---- gdm-2.15.7/config/gdm.conf.in
-+++ gdm-2.15.7/config/gdm.conf.in
-@@ -356,7 +356,7 @@
+--- gdm-2.16.1/config/gdm.conf.in
++++ gdm-2.16.1/config/gdm.conf.in
+@@ -362,7 +362,7 @@
# large numbers of users and this feature should not be used in such
# environments. The setting of IncludeAll does nothing if Include is set to a
# non-empty value.
++++++ gdm-2.8.0.7-bg-4.patch ++++++
--- /var/tmp/diff_new_pack.IhcftG/_old 2006-10-13 04:36:19.000000000 +0200
+++ /var/tmp/diff_new_pack.IhcftG/_new 2006-10-13 04:36:19.000000000 +0200
@@ -1,7 +1,6 @@
-diff -ur ../gdm-2.8.0.7/gui/greeter/greeter.c ./gui/greeter/greeter.c
---- ../gdm-2.8.0.7/gui/greeter/greeter.c 2005-11-22 08:51:29.000000000 +0100
-+++ ./gui/greeter/greeter.c 2005-12-02 23:03:53.000000000 +0100
-@@ -1218,6 +1218,7 @@
+--- gdm-2.16.1/gui/greeter/greeter.c
++++ gdm-2.16.1/gui/greeter/greeter.c
+@@ -1025,6 +1025,7 @@
const char *gdm_gtk_theme;
guint sid;
int r;
@@ -9,28 +8,27 @@
if (g_getenv ("DOING_GDM_DEVELOPMENT") != NULL)
DOING_GDM_DEVELOPMENT = TRUE;
-@@ -1316,6 +1317,7 @@
+@@ -1123,6 +1124,7 @@
}
-
+
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ gtk_widget_modify_bg (window, GTK_STATE_NORMAL, &black);
- if G_UNLIKELY (DOING_GDM_DEVELOPMENT)
- g_signal_connect (G_OBJECT (window), "key_press_event",
-@@ -1331,6 +1333,7 @@
+ if G_UNLIKELY (DOING_GDM_DEVELOPMENT) {
+ g_signal_connect (G_OBJECT (window), "key_press_event",
+@@ -1139,6 +1141,7 @@
gtk_window_set_default_size (GTK_WINDOW (window),
gdm_wm_screen.width,
gdm_wm_screen.height);
+ gtk_widget_modify_bg (canvas, GTK_STATE_NORMAL, &black);
gtk_container_add (GTK_CONTAINER (window), canvas);
- if (g_getenv ("GDM_THEME") != NULL)
-diff -ur ../gdm-2.8.0.7/gui/greeter/greeter_canvas_item.c ./gui/greeter/greeter_canvas_item.c
---- ../gdm-2.8.0.7/gui/greeter/greeter_canvas_item.c 2005-07-20 21:09:36.000000000 +0200
-+++ ./gui/greeter/greeter_canvas_item.c 2005-12-02 22:49:47.000000000 +0100
-@@ -25,6 +25,12 @@
+ /*
+--- gdm-2.16.1/gui/greeter/greeter_canvas_item.c
++++ gdm-2.16.1/gui/greeter/greeter_canvas_item.c
+@@ -24,6 +24,12 @@
+ #include
#include
- #include "vicious.h"
+#include
+#include
@@ -40,9 +38,9 @@
+
#include "gdm.h"
#include "gdmcommon.h"
- #include "greeter.h"
-@@ -193,6 +199,127 @@
- c->pixel = 0;
+ #include "gdmconfig.h"
+@@ -249,6 +255,127 @@
+ gtk_widget_grab_focus (entry);
}
+/* Create a persistent pixmap. We create a separate display
@@ -169,7 +167,7 @@
void
greeter_item_create_canvas_item (GreeterItemInfo *item)
{
-@@ -289,12 +414,53 @@
+@@ -346,12 +473,53 @@
}
if (item->data.pixmap.pixbufs[GREETER_ITEM_STATE_NORMAL] != NULL)
@@ -222,4 +220,4 @@
+ }
break;
case GREETER_ITEM_TYPE_LABEL:
- text = greeter_item_expand_text (item->data.text.orig_text);
+ text = gdm_common_expand_text (item->data.text.orig_text);
++++++ gdm-2.8.0.7-onlyshow-in-gnome.diff ++++++
--- /var/tmp/diff_new_pack.IhcftG/_old 2006-10-13 04:36:19.000000000 +0200
+++ /var/tmp/diff_new_pack.IhcftG/_new 2006-10-13 04:36:19.000000000 +0200
@@ -1,21 +1,21 @@
Index: gdm-2.8.0.7/gui/gdmflexiserver-xnest.desktop.in
================================================================================
---- gdm-2.15.7/gui/gdmflexiserver-xnest.desktop.in
-+++ gdm-2.15.7/gui/gdmflexiserver-xnest.desktop.in
+--- gdm-2.16.1/gui/gdmflexiserver-xnest.desktop.in
++++ gdm-2.16.1/gui/gdmflexiserver-xnest.desktop.in
@@ -14,3 +14,4 @@
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=gdm
X-GNOME-Bugzilla-Component=general
+OnlyShowIn=GNOME;
---- gdm-2.15.7/gui/gdmflexiserver.desktop.in
-+++ gdm-2.15.7/gui/gdmflexiserver.desktop.in
+--- gdm-2.16.1/gui/gdmflexiserver.desktop.in
++++ gdm-2.16.1/gui/gdmflexiserver.desktop.in
@@ -11,3 +11,4 @@
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=gdm
X-GNOME-Bugzilla-Component=general
+OnlyShowIn=GNOME;
---- gdm-2.15.7/gui/gdmphotosetup.desktop.in
-+++ gdm-2.15.7/gui/gdmphotosetup.desktop.in
+--- gdm-2.16.1/gui/gdmphotosetup.desktop.in
++++ gdm-2.16.1/gui/gdmphotosetup.desktop.in
@@ -13,3 +13,4 @@
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=gdm
++++++ gdm-2.8.0.7-some-info-in-dialog.patch ++++++
--- /var/tmp/diff_new_pack.IhcftG/_old 2006-10-13 04:36:19.000000000 +0200
+++ /var/tmp/diff_new_pack.IhcftG/_new 2006-10-13 04:36:19.000000000 +0200
@@ -1,7 +1,6 @@
-diff -upr gdm-2.8.0.7-pre/daemon/verify-pam.c gdm-2.8.0.7-post/daemon/verify-pam.c
---- gdm-2.8.0.7-pre/daemon/verify-pam.c 2006-04-25 18:03:09.000000000 -0500
-+++ gdm-2.8.0.7-post/daemon/verify-pam.c 2006-04-25 18:46:14.000000000 -0500
-@@ -514,7 +514,7 @@ gdm_verify_pam_conv (int num_msg, const
+--- gdm-2.16.1/daemon/verify-pam.c
++++ gdm-2.16.1/daemon/verify-pam.c
+@@ -595,7 +595,7 @@
break;
case PAM_TEXT_INFO:
/* PAM sent a message that should displayed to the user */
++++++ gdm-X_SERVER.patch ++++++
--- configure.ac
+++ configure.ac
@@ -987,6 +987,11 @@
X_SERVER="/usr/X11R6/bin/X"
GDM_USER_PATH="$GDM_USER_PATH:/usr/X11R6/bin"
X_CONFIG_OPTIONS="-audit 0"
+elif test -x /usr/bin/X; then
+ X_PATH="/usr/bin"
+ X_SERVER_PATH="/usr/bin"
+ X_SERVER="/usr/bin/X"
+ X_CONFIG_OPTIONS="-audit 0"
elif test -x /usr/bin/Xorg; then
X_PATH="/usr/bin"
X_SERVER_PATH="/usr/bin"
++++++ gdm-gdmsetup-rootonly.patch ++++++
--- gui/gdmsetup.desktop.in.in
+++ gui/gdmsetup.desktop.in.in
@@ -5,6 +5,7 @@
_Comment=Configure the login window (GNOME Display Manager)
TryExec=@sbindir@/gdmsetup
Exec=gdmsetup
+X-KDE-RootOnly=true
Icon=gdm-setup
StartupNotify=true
Terminal=false
++++++ gdm-logdir.patch ++++++
--- /var/tmp/diff_new_pack.IhcftG/_old 2006-10-13 04:36:19.000000000 +0200
+++ /var/tmp/diff_new_pack.IhcftG/_new 2006-10-13 04:36:20.000000000 +0200
@@ -1,23 +1,22 @@
--- config/Makefile.am
+++ config/Makefile.am
-@@ -7,7 +7,7 @@
+@@ -5,7 +5,7 @@
instsessdir = $(datadir)/xsessions
- initdir = $(sysconfdir)/gdm/Init
+ initdir = $(gdmconfdir)/Init
authdir = $(localstatedir)/gdm
-logdir = $(localstatedir)/log/gdm
-+logdir = /var/log/gdm
- gnomercdir = $(sysconfdir)/gdm
- postdir = $(sysconfdir)/gdm/PostSession
- predir = $(sysconfdir)/gdm/PreSession
---- configure.in
-+++ configure.in
-@@ -793,8 +793,7 @@
- AC_SUBST(EXPANDED_AUTHDIR)
- AC_DEFINE_UNQUOTED(EXPANDED_AUTHDIR,"$EXPANDED_AUTHDIR")
-
--LOGDIR_TMP="$localstatedir/log/gdm"
--EXPANDED_LOGDIR=`eval echo $LOGDIR_TMP`
-+EXPANDED_LOGDIR=/var/log/gdm
- AC_SUBST(EXPANDED_LOGDIR)
- AC_DEFINE_UNQUOTED(EXPANDED_LOGDIR,"$EXPANDED_LOGDIR")
++logdir = @logdir@
+ gnomercdir = $(gdmconfdir)
+ postdir = $(gdmconfdir)/PostSession
+ predir = $(gdmconfdir)/PreSession
+--- configure.ac
++++ configure.ac
+@@ -791,7 +791,7 @@
+ #
+ AC_SUBST(authdir, ${localstatedir}/gdm)
+ AC_SUBST(gdmlocaledir, ${gdmconfdir})
+-AC_SUBST(logdir, ${localstatedir}/log/gdm)
++AC_SUBST(logdir, /var/log/gdm)
+ AC_SUBST(pixmapdir, ${datadir}/pixmaps)
+ withval=""
++++++ gdm-presession-kde-path.patch ++++++
--- /var/tmp/diff_new_pack.IhcftG/_old 2006-10-13 04:36:20.000000000 +0200
+++ /var/tmp/diff_new_pack.IhcftG/_new 2006-10-13 04:36:20.000000000 +0200
@@ -1,5 +1,5 @@
---- gdm-2.8.0.4/config/PreSession.in
-+++ gdm-2.8.0.4/config/PreSession.in
+--- gdm-2.16.1/config/PreSession.in
++++ gdm-2.16.1/config/PreSession.in
@@ -6,7 +6,7 @@
#
# Note that output goes into the .xsession-errors file for easy debugging
++++++ gdm-server-timeout.patch ++++++
--- daemon/gdm.h
+++ daemon/gdm.h
@@ -270,7 +270,7 @@
#define GDM_KEY_CONSOLE_CANNOT_HANDLE "daemon/ConsoleCannotHandle=am,ar,az,bn,el,fa,gu,hi,ja,ko,ml,mr,pa,ta,zh"
/* How long to wait before assuming an Xserver has timed out */
-#define GDM_KEY_XSERVER_TIMEOUT "daemon/GdmXserverTimeout=10"
+#define GDM_KEY_XSERVER_TIMEOUT "daemon/GdmXserverTimeout=30"
/* Per server definitions */
#define GDM_KEY_SERVER_PREFIX "server-"
++++++ gdm-xdm-sessions.patch ++++++
--- /var/tmp/diff_new_pack.IhcftG/_old 2006-10-13 04:36:20.000000000 +0200
+++ /var/tmp/diff_new_pack.IhcftG/_new 2006-10-13 04:36:20.000000000 +0200
@@ -1,5 +1,5 @@
---- gdm-2.15.7/config/Xsession.in
-+++ gdm-2.15.7/config/Xsession.in
+--- gdm-2.16.1/config/Xsession.in
++++ gdm-2.16.1/config/Xsession.in
@@ -1,247 +1,3 @@
#!@XSESSION_SHELL@
-#
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org