Hello community, here is the log from the commit of package gdm checked in at Thu Oct 18 17:29:51 CEST 2007. -------- --- GNOME/gdm/gdm.changes 2007-10-11 16:39:37.000000000 +0200 +++ /mounts/work_src_done/STABLE/gdm/gdm.changes 2007-10-18 17:20:42.019828000 +0200 @@ -1,0 +2,6 @@ +Thu Oct 18 17:02:46 CEST 2007 - maw@suse.de + +- Install dbus-gdm.conf to /etc/dbus-1/system.d (#331725) +- Add abuild.patch. + +------------------------------------------------------------------- New: ---- abuild.patch dbus-gdm.conf ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gdm.spec ++++++ --- /var/tmp/diff_new_pack.H28996/_old 2007-10-18 17:29:18.000000000 +0200 +++ /var/tmp/diff_new_pack.H28996/_new 2007-10-18 17:29:18.000000000 +0200 @@ -22,7 +22,7 @@ License: GPL v2 or later Group: System/GUI/GNOME Version: 2.20.0 -Release: 14 +Release: 19 Summary: The GNOME 2.x Display Manager Source: %{name}-%{version}.tar.bz2 Source1: gdm.pamd @@ -30,6 +30,7 @@ # FIXME: See FIXME in the script. Source3: SuSEconfig.gdm Source5: sysconfig.displaymanager-gdm +Source6: dbus-gdm.conf Patch0: gdm-conf.patch Patch3: gdm-language-dialog-size.patch Patch5: gdm-xdm-sessions.patch @@ -58,6 +59,8 @@ Patch43: gdm-language-hang.patch Patch44: gdm-language-save.patch Patch45: gdm-2.20.0-wait-for-restart.patch +# PATCH-FIX-UPSTREAM abuild.patch maw@novell.com -- already fixed in gdm trunk, will go away when we upgrade to 2.21 +Patch46: abuild.patch Url: http://www.gnome.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build DocDir: %{_defaultdocdir} @@ -116,6 +119,7 @@ %patch43 %patch44 %patch45 -p1 +%patch46 -p1 gnome-patch-translation-update %build @@ -150,6 +154,11 @@ mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates cp %{S:5} $RPM_BUILD_ROOT/var/adm/fillup-templates %endif +# +%if %suse_version > 1030 +mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/dbus-1/system.d +cp %{S:6} $RPM_BUILD_ROOT/%{_sysconfdir}/dbus-1/system.d/gdm.conf +%endif touch $RPM_BUILD_ROOT%{_sysconfdir}/gdm/gdm_sysconfig.conf # gnome.desktop should be in gnome-session, ssh.desktop doesn't work rm $RPM_BUILD_ROOT%{_datadir}/xsessions/ssh.desktop @@ -245,9 +254,15 @@ %if %suse_version <= 1020 %dir /usr/share/xsessions %endif +%if %suse_version > 1030 +%{_sysconfdir}/dbus-1/system.d/gdm.conf +%endif %files lang -f %{name}.lang %changelog +* Thu Oct 18 2007 - maw@suse.de +- Install dbus-gdm.conf to /etc/dbus-1/system.d (#331725) +- Add abuild.patch. * Thu Oct 11 2007 - sbrabec@suse.cz - Removed bogus dependency on mDNSResponder. * Mon Sep 24 2007 - hpj@suse.de ++++++ abuild.patch ++++++ Index: gdm-2.20.0/daemon/gdm.c =================================================================== --- gdm-2.20.0.orig/daemon/gdm.c +++ gdm-2.20.0/daemon/gdm.c @@ -623,7 +623,7 @@ try_command (const char *command) } } else if (WIFSIGNALED (status)) { - gdm_error ("Command '%s' was killed by signal '%s'"), command, g_strsignal (WTERMSIG (status)); + gdm_error ("Command '%s' was killed by signal '%s'", command, g_strsignal (WTERMSIG (status))); res = FALSE; } } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org