From 35c884f0e52a05616f6a3eea6d9014dced82aa72095bcbcf1143b10229faaadb Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Thu, 24 Dec 2009 15:29:32 +0000 Subject: [PATCH 1/4] Accepting request 27497 from home:vuntz:branches:GNOME:Factory Copy from home:vuntz:branches:GNOME:Factory/gdm via accept of submit request 27497 revision 2. Request was accepted with message: accept OBS-URL: https://build.opensuse.org/request/show/27497 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=109 --- gdm-2.29.1.tar.bz2 | 3 -- gdm-2.29.4.tar.bz2 | 3 ++ gdm-helper-directory.patch | 64 +++++++++++++++++++++----------------- gdm-selinux.patch | 20 +++++++----- gdm.changes | 15 +++++++++ gdm.spec | 5 +-- 6 files changed, 69 insertions(+), 41 deletions(-) delete mode 100644 gdm-2.29.1.tar.bz2 create mode 100644 gdm-2.29.4.tar.bz2 diff --git a/gdm-2.29.1.tar.bz2 b/gdm-2.29.1.tar.bz2 deleted file mode 100644 index 1aa2e55..0000000 --- a/gdm-2.29.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6ca5d04512cb51ea2288661f9e5786645485ede2e3d510b0998bd75ea1ce1ff5 -size 2337055 diff --git a/gdm-2.29.4.tar.bz2 b/gdm-2.29.4.tar.bz2 new file mode 100644 index 0000000..c25098e --- /dev/null +++ b/gdm-2.29.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cb0b2a7d8c832afb275a3a4c95b91097f18e9e2c0acc6bdbaa63ec466507c320 +size 2360981 diff --git a/gdm-helper-directory.patch b/gdm-helper-directory.patch index 728f72b..3bdc60d 100644 --- a/gdm-helper-directory.patch +++ b/gdm-helper-directory.patch @@ -1,8 +1,8 @@ -Index: gdm-2.29.1/configure.ac +Index: gdm-2.29.4/configure.ac =================================================================== ---- gdm-2.29.1.orig/configure.ac -+++ gdm-2.29.1/configure.ac -@@ -990,6 +990,22 @@ fi +--- gdm-2.29.4.orig/configure.ac ++++ gdm-2.29.4/configure.ac +@@ -990,6 +990,30 @@ fi AC_SUBST(GDM_CUSTOM_CONF) AC_SUBST(GDM_OLD_CONF, '${gdmconfdir}/gdm.conf') @@ -21,23 +21,32 @@ Index: gdm-2.29.1/configure.ac + +CONSOLEKIT_DIR=$with_consolekit_directory +AC_SUBST(CONSOLEKIT_DIR) ++ ++AC_ARG_WITH(polkit-gnome-directory, ++ [AC_HELP_STRING([--with-polkit-gnome-directory], ++ [Specify the directory of polkit-gnome-authentication-agent-1 @<:@default=libexecdir@:>@])],, ++ [with_polkit_gnome_directory="\${libexecdir}"]) ++ ++POLKIT_GNOME_DIR=$with_polkit_gnome_directory ++AC_SUBST(POLKIT_GNOME_DIR) + dnl --------------------------------------------------------------------------- dnl - Check for XEvIE extension support dnl --------------------------------------------------------------------------- -@@ -1417,6 +1433,8 @@ echo " +@@ -1417,6 +1441,9 @@ echo " dmconfdir: ${dmconfdir} localstatedir: ${localstatedir} datadir: ${datadir} + g-s-d location: ${with_gnome_settings_daemon_directory} + consolekit location: ${with_consolekit_directory} ++ polkit-gnome location: ${with_polkit_gnome_directory} source code location: ${srcdir} compiler: ${CC} cflags: ${CFLAGS} -Index: gdm-2.29.1/daemon/Makefile.am +Index: gdm-2.29.4/daemon/Makefile.am =================================================================== ---- gdm-2.29.1.orig/daemon/Makefile.am -+++ gdm-2.29.1/daemon/Makefile.am +--- gdm-2.29.4.orig/daemon/Makefile.am ++++ gdm-2.29.4/daemon/Makefile.am @@ -18,6 +18,7 @@ AM_CPPFLAGS = \ -DGDM_SCREENSHOT_DIR=\"$(GDM_SCREENSHOT_DIR)\" \ -DGDM_CACHE_DIR=\""$(localstatedir)/cache/gdm"\" \ @@ -46,10 +55,10 @@ Index: gdm-2.29.1/daemon/Makefile.am $(DISABLE_DEPRECATED_CFLAGS) \ $(DAEMON_CFLAGS) \ $(XLIB_CFLAGS) \ -Index: gdm-2.29.1/daemon/gdm-server.c +Index: gdm-2.29.4/daemon/gdm-server.c =================================================================== ---- gdm-2.29.1.orig/daemon/gdm-server.c -+++ gdm-2.29.1/daemon/gdm-server.c +--- gdm-2.29.4.orig/daemon/gdm-server.c ++++ gdm-2.29.4/daemon/gdm-server.c @@ -127,7 +127,7 @@ _gdm_server_query_ck_for_display_device g_return_val_if_fail (GDM_IS_SERVER (server), NULL); @@ -59,24 +68,25 @@ Index: gdm-2.29.1/daemon/gdm-server.c server->priv->display_name); g_debug ("GdmServer: Running helper %s", command); -Index: gdm-2.29.1/data/greeter-autostart/Makefile.am +Index: gdm-2.29.4/data/greeter-autostart/Makefile.am =================================================================== ---- gdm-2.29.1.orig/data/greeter-autostart/Makefile.am -+++ gdm-2.29.1/data/greeter-autostart/Makefile.am -@@ -5,7 +5,8 @@ edit = sed \ +--- gdm-2.29.4.orig/data/greeter-autostart/Makefile.am ++++ gdm-2.29.4/data/greeter-autostart/Makefile.am +@@ -5,7 +5,9 @@ edit = sed \ -e 's|@SYSCONFDIR[@]|$(sysconfdir)|g' \ -e 's|@LIBDIR[@]|$(libdir)|g' \ -e 's|@LIBEXECDIR[@]|$(libexecdir)|g' \ - -e 's|@LOCALSTATEDIR[@]|$(localstatedir)|g' + -e 's|@LOCALSTATEDIR[@]|$(localstatedir)|g' \ -+ -e 's|@GNOME_SETTINGS_DAEMON_DIR[@]|$(GNOME_SETTINGS_DAEMON_DIR)|g' ++ -e 's|@GNOME_SETTINGS_DAEMON_DIR[@]|$(GNOME_SETTINGS_DAEMON_DIR)|g' \ ++ -e 's|@POLKIT_GNOME_DIR[@]|$(POLKIT_GNOME_DIR)|g' %.desktop.in: %.desktop.in.in Makefile $(edit) $< >$@ -Index: gdm-2.29.1/data/greeter-autostart/gnome-settings-daemon.desktop.in.in +Index: gdm-2.29.4/data/greeter-autostart/gnome-settings-daemon.desktop.in.in =================================================================== ---- gdm-2.29.1.orig/data/greeter-autostart/gnome-settings-daemon.desktop.in.in -+++ gdm-2.29.1/data/greeter-autostart/gnome-settings-daemon.desktop.in.in +--- gdm-2.29.4.orig/data/greeter-autostart/gnome-settings-daemon.desktop.in.in ++++ gdm-2.29.4/data/greeter-autostart/gnome-settings-daemon.desktop.in.in @@ -1,8 +1,8 @@ [Desktop Entry] Type=Application @@ -88,16 +98,14 @@ Index: gdm-2.29.1/data/greeter-autostart/gnome-settings-daemon.desktop.in.in OnlyShowIn=GNOME; X-GNOME-Autostart-Phase=Initialization X-GNOME-Autostart-Notify=true -Index: gdm-2.29.1/data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in +Index: gdm-2.29.4/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in =================================================================== ---- gdm-2.29.1.orig/data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in -+++ gdm-2.29.1/data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in -@@ -1,7 +1,7 @@ +--- gdm-2.29.4.orig/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in ++++ gdm-2.29.4/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in +@@ -1,5 +1,5 @@ [Desktop Entry] Type=Application - _Name=AT SPI Registry Wrapper --Exec=@LIBEXECDIR@/at-spi-registryd -+Exec=@AT_SPI_REGISTRYD_DIR@/at-spi-registryd + _Name=PolicyKit Authentication Agent +-Exec=@LIBEXECDIR@/polkit-gnome-authentication-agent-1 ++Exec=@POLKIT_GNOME_DIR@/polkit-gnome-authentication-agent-1 OnlyShowIn=GNOME; - AutostartCondition=GNOME /desktop/gnome/interface/accessibility - X-GNOME-Autostart-Phase=Initialization diff --git a/gdm-selinux.patch b/gdm-selinux.patch index 0aa2c2b..0dbf9b9 100644 --- a/gdm-selinux.patch +++ b/gdm-selinux.patch @@ -1,17 +1,21 @@ ---- configure.org 2008-12-29 09:24:05.000000000 +1100 -+++ configure 2008-12-29 09:24:19.000000000 +1100 -@@ -35527,7 +35527,7 @@ cat >>confdefs.h <<\_ACEOF - #define HAVE_SELINUX 1 - _ACEOF +Index: configure +=================================================================== +--- configure.orig ++++ configure +@@ -22413,7 +22413,7 @@ fi + + $as_echo "#define HAVE_SELINUX 1" >>confdefs.h - EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lselinux -lattr" + EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lselinux" fi ---- configure.ac.org 2008-12-29 09:25:17.000000000 +1100 -+++ configure.ac 2008-12-29 09:25:22.000000000 +1100 -@@ -873,7 +873,7 @@ if test "x$with_selinux" = "xyes" ; then +Index: configure.ac +=================================================================== +--- configure.ac.orig ++++ configure.ac +@@ -859,7 +859,7 @@ if test "x$with_selinux" = "xyes" ; then AC_CHECK_LIB(selinux,setexeccon,/bin/true) AC_CHECK_LIB(selinux,is_selinux_enabled,/bin/true) AC_DEFINE(HAVE_SELINUX, 1, [Define if have selinux]) diff --git a/gdm.changes b/gdm.changes index bd2a1e6..ccdea3a 100644 --- a/gdm.changes +++ b/gdm.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Wed Dec 23 00:25:29 CET 2009 - vuntz@opensuse.org + +- Update to version 2.29.4: + + Remove deprecated function g_mapped_file_free + + Fix option widgets to work better with orca + + Make --with-custom-conf work + + Don't hard code path to policykit agent + + Don't backup xkb configuration before login +- Update gdm-helper-directory.patch: some part is now fixed + upstream, and we also need to set the right path for the + polkit-gnome agent. +- Pass --with-polkit-gnome-directory to configure. +- Update gdm-selinux.patch to apply without fuzz. + ------------------------------------------------------------------- Thu Dec 3 11:13:08 CET 2009 - vuntz@opensuse.org diff --git a/gdm.spec b/gdm.spec index ba5e213..bf52f90 100644 --- a/gdm.spec +++ b/gdm.spec @@ -1,5 +1,5 @@ # -# spec file for package gdm (Version 2.29.1) +# spec file for package gdm (Version 2.29.4) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -42,7 +42,7 @@ BuildRequires: xorg-x11-server-extra BuildRequires: zenity License: GPLv2+ Group: System/GUI/GNOME -Version: 2.29.1 +Version: 2.29.4 Release: 1 Summary: The GNOME 2.x Display Manager Source: %{name}-%{version}.tar.bz2 @@ -168,6 +168,7 @@ autoreconf -f -i --with-at-spi-registryd-directory=%{_libexecdir}/at-spi2 \ --with-gnome-settings-daemon-directory=%{_libexecdir}/gnome-settings-daemon \ --with-consolekit-directory=%{_libexecdir}/ConsoleKit \ + --with-polkit-gnome-directory=%{_libexecdir}/polkit-gnome \ --with-selinux \ --enable-ipv6\ --disable-scrollkeeper From 490dda07b76813d8459cb5db0f8aec5719d95333dd83cb0e8106302351223ce8 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Thu, 24 Dec 2009 17:05:15 +0000 Subject: [PATCH 2/4] Accepting request 27625 from home:vuntz:branches:GNOME:Factory Copy from home:vuntz:branches:GNOME:Factory/gdm via accept of submit request 27625 revision 2. Request was accepted with message: accept OBS-URL: https://build.opensuse.org/request/show/27625 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=110 --- gdm.changes | 5 +++++ gdm.spec | 2 ++ 2 files changed, 7 insertions(+) diff --git a/gdm.changes b/gdm.changes index ccdea3a..694f14d 100644 --- a/gdm.changes +++ b/gdm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Dec 24 17:57:48 CET 2009 - vuntz@opensuse.org + +- Add hal-devel BuildRequires to fix build. + ------------------------------------------------------------------- Wed Dec 23 00:25:29 CET 2009 - vuntz@opensuse.org diff --git a/gdm.spec b/gdm.spec index bf52f90..d32221a 100644 --- a/gdm.spec +++ b/gdm.spec @@ -26,6 +26,8 @@ BuildRequires: gconf2-devel BuildRequires: gnome-doc-utils-devel BuildRequires: gnome-panel-devel BuildRequires: gnome-patch-translation +# Needed for Patch32 - gdm-keyboard-from-hal.patch +BuildRequires: hal-devel BuildRequires: intltool BuildRequires: iso-codes-devel BuildRequires: libcanberra-devel From a6a634026b6011d78aaa4e5fc4bb0ae71e13386087a08cb902e7c8b19615c5a2 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Tue, 29 Dec 2009 23:19:05 +0000 Subject: [PATCH 3/4] checked in OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=111 --- gdm-2.29.1.tar.bz2 | 3 ++ gdm-2.29.4.tar.bz2 | 3 -- gdm-helper-directory.patch | 64 +++++++++++++++++--------------------- gdm-selinux.patch | 20 +++++------- gdm.changes | 20 ------------ gdm.spec | 7 ++--- 6 files changed, 41 insertions(+), 76 deletions(-) create mode 100644 gdm-2.29.1.tar.bz2 delete mode 100644 gdm-2.29.4.tar.bz2 diff --git a/gdm-2.29.1.tar.bz2 b/gdm-2.29.1.tar.bz2 new file mode 100644 index 0000000..1aa2e55 --- /dev/null +++ b/gdm-2.29.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6ca5d04512cb51ea2288661f9e5786645485ede2e3d510b0998bd75ea1ce1ff5 +size 2337055 diff --git a/gdm-2.29.4.tar.bz2 b/gdm-2.29.4.tar.bz2 deleted file mode 100644 index c25098e..0000000 --- a/gdm-2.29.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cb0b2a7d8c832afb275a3a4c95b91097f18e9e2c0acc6bdbaa63ec466507c320 -size 2360981 diff --git a/gdm-helper-directory.patch b/gdm-helper-directory.patch index 3bdc60d..728f72b 100644 --- a/gdm-helper-directory.patch +++ b/gdm-helper-directory.patch @@ -1,8 +1,8 @@ -Index: gdm-2.29.4/configure.ac +Index: gdm-2.29.1/configure.ac =================================================================== ---- gdm-2.29.4.orig/configure.ac -+++ gdm-2.29.4/configure.ac -@@ -990,6 +990,30 @@ fi +--- gdm-2.29.1.orig/configure.ac ++++ gdm-2.29.1/configure.ac +@@ -990,6 +990,22 @@ fi AC_SUBST(GDM_CUSTOM_CONF) AC_SUBST(GDM_OLD_CONF, '${gdmconfdir}/gdm.conf') @@ -21,32 +21,23 @@ Index: gdm-2.29.4/configure.ac + +CONSOLEKIT_DIR=$with_consolekit_directory +AC_SUBST(CONSOLEKIT_DIR) -+ -+AC_ARG_WITH(polkit-gnome-directory, -+ [AC_HELP_STRING([--with-polkit-gnome-directory], -+ [Specify the directory of polkit-gnome-authentication-agent-1 @<:@default=libexecdir@:>@])],, -+ [with_polkit_gnome_directory="\${libexecdir}"]) -+ -+POLKIT_GNOME_DIR=$with_polkit_gnome_directory -+AC_SUBST(POLKIT_GNOME_DIR) + dnl --------------------------------------------------------------------------- dnl - Check for XEvIE extension support dnl --------------------------------------------------------------------------- -@@ -1417,6 +1441,9 @@ echo " +@@ -1417,6 +1433,8 @@ echo " dmconfdir: ${dmconfdir} localstatedir: ${localstatedir} datadir: ${datadir} + g-s-d location: ${with_gnome_settings_daemon_directory} + consolekit location: ${with_consolekit_directory} -+ polkit-gnome location: ${with_polkit_gnome_directory} source code location: ${srcdir} compiler: ${CC} cflags: ${CFLAGS} -Index: gdm-2.29.4/daemon/Makefile.am +Index: gdm-2.29.1/daemon/Makefile.am =================================================================== ---- gdm-2.29.4.orig/daemon/Makefile.am -+++ gdm-2.29.4/daemon/Makefile.am +--- gdm-2.29.1.orig/daemon/Makefile.am ++++ gdm-2.29.1/daemon/Makefile.am @@ -18,6 +18,7 @@ AM_CPPFLAGS = \ -DGDM_SCREENSHOT_DIR=\"$(GDM_SCREENSHOT_DIR)\" \ -DGDM_CACHE_DIR=\""$(localstatedir)/cache/gdm"\" \ @@ -55,10 +46,10 @@ Index: gdm-2.29.4/daemon/Makefile.am $(DISABLE_DEPRECATED_CFLAGS) \ $(DAEMON_CFLAGS) \ $(XLIB_CFLAGS) \ -Index: gdm-2.29.4/daemon/gdm-server.c +Index: gdm-2.29.1/daemon/gdm-server.c =================================================================== ---- gdm-2.29.4.orig/daemon/gdm-server.c -+++ gdm-2.29.4/daemon/gdm-server.c +--- gdm-2.29.1.orig/daemon/gdm-server.c ++++ gdm-2.29.1/daemon/gdm-server.c @@ -127,7 +127,7 @@ _gdm_server_query_ck_for_display_device g_return_val_if_fail (GDM_IS_SERVER (server), NULL); @@ -68,25 +59,24 @@ Index: gdm-2.29.4/daemon/gdm-server.c server->priv->display_name); g_debug ("GdmServer: Running helper %s", command); -Index: gdm-2.29.4/data/greeter-autostart/Makefile.am +Index: gdm-2.29.1/data/greeter-autostart/Makefile.am =================================================================== ---- gdm-2.29.4.orig/data/greeter-autostart/Makefile.am -+++ gdm-2.29.4/data/greeter-autostart/Makefile.am -@@ -5,7 +5,9 @@ edit = sed \ +--- gdm-2.29.1.orig/data/greeter-autostart/Makefile.am ++++ gdm-2.29.1/data/greeter-autostart/Makefile.am +@@ -5,7 +5,8 @@ edit = sed \ -e 's|@SYSCONFDIR[@]|$(sysconfdir)|g' \ -e 's|@LIBDIR[@]|$(libdir)|g' \ -e 's|@LIBEXECDIR[@]|$(libexecdir)|g' \ - -e 's|@LOCALSTATEDIR[@]|$(localstatedir)|g' + -e 's|@LOCALSTATEDIR[@]|$(localstatedir)|g' \ -+ -e 's|@GNOME_SETTINGS_DAEMON_DIR[@]|$(GNOME_SETTINGS_DAEMON_DIR)|g' \ -+ -e 's|@POLKIT_GNOME_DIR[@]|$(POLKIT_GNOME_DIR)|g' ++ -e 's|@GNOME_SETTINGS_DAEMON_DIR[@]|$(GNOME_SETTINGS_DAEMON_DIR)|g' %.desktop.in: %.desktop.in.in Makefile $(edit) $< >$@ -Index: gdm-2.29.4/data/greeter-autostart/gnome-settings-daemon.desktop.in.in +Index: gdm-2.29.1/data/greeter-autostart/gnome-settings-daemon.desktop.in.in =================================================================== ---- gdm-2.29.4.orig/data/greeter-autostart/gnome-settings-daemon.desktop.in.in -+++ gdm-2.29.4/data/greeter-autostart/gnome-settings-daemon.desktop.in.in +--- gdm-2.29.1.orig/data/greeter-autostart/gnome-settings-daemon.desktop.in.in ++++ gdm-2.29.1/data/greeter-autostart/gnome-settings-daemon.desktop.in.in @@ -1,8 +1,8 @@ [Desktop Entry] Type=Application @@ -98,14 +88,16 @@ Index: gdm-2.29.4/data/greeter-autostart/gnome-settings-daemon.desktop.in.in OnlyShowIn=GNOME; X-GNOME-Autostart-Phase=Initialization X-GNOME-Autostart-Notify=true -Index: gdm-2.29.4/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in +Index: gdm-2.29.1/data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in =================================================================== ---- gdm-2.29.4.orig/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in -+++ gdm-2.29.4/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in -@@ -1,5 +1,5 @@ +--- gdm-2.29.1.orig/data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in ++++ gdm-2.29.1/data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in +@@ -1,7 +1,7 @@ [Desktop Entry] Type=Application - _Name=PolicyKit Authentication Agent --Exec=@LIBEXECDIR@/polkit-gnome-authentication-agent-1 -+Exec=@POLKIT_GNOME_DIR@/polkit-gnome-authentication-agent-1 + _Name=AT SPI Registry Wrapper +-Exec=@LIBEXECDIR@/at-spi-registryd ++Exec=@AT_SPI_REGISTRYD_DIR@/at-spi-registryd OnlyShowIn=GNOME; + AutostartCondition=GNOME /desktop/gnome/interface/accessibility + X-GNOME-Autostart-Phase=Initialization diff --git a/gdm-selinux.patch b/gdm-selinux.patch index 0dbf9b9..0aa2c2b 100644 --- a/gdm-selinux.patch +++ b/gdm-selinux.patch @@ -1,21 +1,17 @@ -Index: configure -=================================================================== ---- configure.orig -+++ configure -@@ -22413,7 +22413,7 @@ fi - - $as_echo "#define HAVE_SELINUX 1" >>confdefs.h +--- configure.org 2008-12-29 09:24:05.000000000 +1100 ++++ configure 2008-12-29 09:24:19.000000000 +1100 +@@ -35527,7 +35527,7 @@ cat >>confdefs.h <<\_ACEOF + #define HAVE_SELINUX 1 + _ACEOF - EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lselinux -lattr" + EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lselinux" fi -Index: configure.ac -=================================================================== ---- configure.ac.orig -+++ configure.ac -@@ -859,7 +859,7 @@ if test "x$with_selinux" = "xyes" ; then +--- configure.ac.org 2008-12-29 09:25:17.000000000 +1100 ++++ configure.ac 2008-12-29 09:25:22.000000000 +1100 +@@ -873,7 +873,7 @@ if test "x$with_selinux" = "xyes" ; then AC_CHECK_LIB(selinux,setexeccon,/bin/true) AC_CHECK_LIB(selinux,is_selinux_enabled,/bin/true) AC_DEFINE(HAVE_SELINUX, 1, [Define if have selinux]) diff --git a/gdm.changes b/gdm.changes index 694f14d..bd2a1e6 100644 --- a/gdm.changes +++ b/gdm.changes @@ -1,23 +1,3 @@ -------------------------------------------------------------------- -Thu Dec 24 17:57:48 CET 2009 - vuntz@opensuse.org - -- Add hal-devel BuildRequires to fix build. - -------------------------------------------------------------------- -Wed Dec 23 00:25:29 CET 2009 - vuntz@opensuse.org - -- Update to version 2.29.4: - + Remove deprecated function g_mapped_file_free - + Fix option widgets to work better with orca - + Make --with-custom-conf work - + Don't hard code path to policykit agent - + Don't backup xkb configuration before login -- Update gdm-helper-directory.patch: some part is now fixed - upstream, and we also need to set the right path for the - polkit-gnome agent. -- Pass --with-polkit-gnome-directory to configure. -- Update gdm-selinux.patch to apply without fuzz. - ------------------------------------------------------------------- Thu Dec 3 11:13:08 CET 2009 - vuntz@opensuse.org diff --git a/gdm.spec b/gdm.spec index d32221a..ba5e213 100644 --- a/gdm.spec +++ b/gdm.spec @@ -1,5 +1,5 @@ # -# spec file for package gdm (Version 2.29.4) +# spec file for package gdm (Version 2.29.1) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -26,8 +26,6 @@ BuildRequires: gconf2-devel BuildRequires: gnome-doc-utils-devel BuildRequires: gnome-panel-devel BuildRequires: gnome-patch-translation -# Needed for Patch32 - gdm-keyboard-from-hal.patch -BuildRequires: hal-devel BuildRequires: intltool BuildRequires: iso-codes-devel BuildRequires: libcanberra-devel @@ -44,7 +42,7 @@ BuildRequires: xorg-x11-server-extra BuildRequires: zenity License: GPLv2+ Group: System/GUI/GNOME -Version: 2.29.4 +Version: 2.29.1 Release: 1 Summary: The GNOME 2.x Display Manager Source: %{name}-%{version}.tar.bz2 @@ -170,7 +168,6 @@ autoreconf -f -i --with-at-spi-registryd-directory=%{_libexecdir}/at-spi2 \ --with-gnome-settings-daemon-directory=%{_libexecdir}/gnome-settings-daemon \ --with-consolekit-directory=%{_libexecdir}/ConsoleKit \ - --with-polkit-gnome-directory=%{_libexecdir}/polkit-gnome \ --with-selinux \ --enable-ipv6\ --disable-scrollkeeper From e6b64a24bef6f442f875dbd42194d6cf024414550e733187c6878da15f07e043 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Tue, 29 Dec 2009 23:19:06 +0000 Subject: [PATCH 4/4] Updating link to change in openSUSE:Factory/gdm revision 87.0 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=c3e3822d7c766a307059eb0beceeffbe --- gdm-2.29.1.tar.bz2 | 3 -- gdm-2.29.4.tar.bz2 | 3 ++ gdm-helper-directory.patch | 64 +++++++++++++++++++++----------------- gdm-selinux.patch | 20 +++++++----- gdm.changes | 20 ++++++++++++ gdm.spec | 7 +++-- 6 files changed, 76 insertions(+), 41 deletions(-) delete mode 100644 gdm-2.29.1.tar.bz2 create mode 100644 gdm-2.29.4.tar.bz2 diff --git a/gdm-2.29.1.tar.bz2 b/gdm-2.29.1.tar.bz2 deleted file mode 100644 index 1aa2e55..0000000 --- a/gdm-2.29.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6ca5d04512cb51ea2288661f9e5786645485ede2e3d510b0998bd75ea1ce1ff5 -size 2337055 diff --git a/gdm-2.29.4.tar.bz2 b/gdm-2.29.4.tar.bz2 new file mode 100644 index 0000000..c25098e --- /dev/null +++ b/gdm-2.29.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cb0b2a7d8c832afb275a3a4c95b91097f18e9e2c0acc6bdbaa63ec466507c320 +size 2360981 diff --git a/gdm-helper-directory.patch b/gdm-helper-directory.patch index 728f72b..3bdc60d 100644 --- a/gdm-helper-directory.patch +++ b/gdm-helper-directory.patch @@ -1,8 +1,8 @@ -Index: gdm-2.29.1/configure.ac +Index: gdm-2.29.4/configure.ac =================================================================== ---- gdm-2.29.1.orig/configure.ac -+++ gdm-2.29.1/configure.ac -@@ -990,6 +990,22 @@ fi +--- gdm-2.29.4.orig/configure.ac ++++ gdm-2.29.4/configure.ac +@@ -990,6 +990,30 @@ fi AC_SUBST(GDM_CUSTOM_CONF) AC_SUBST(GDM_OLD_CONF, '${gdmconfdir}/gdm.conf') @@ -21,23 +21,32 @@ Index: gdm-2.29.1/configure.ac + +CONSOLEKIT_DIR=$with_consolekit_directory +AC_SUBST(CONSOLEKIT_DIR) ++ ++AC_ARG_WITH(polkit-gnome-directory, ++ [AC_HELP_STRING([--with-polkit-gnome-directory], ++ [Specify the directory of polkit-gnome-authentication-agent-1 @<:@default=libexecdir@:>@])],, ++ [with_polkit_gnome_directory="\${libexecdir}"]) ++ ++POLKIT_GNOME_DIR=$with_polkit_gnome_directory ++AC_SUBST(POLKIT_GNOME_DIR) + dnl --------------------------------------------------------------------------- dnl - Check for XEvIE extension support dnl --------------------------------------------------------------------------- -@@ -1417,6 +1433,8 @@ echo " +@@ -1417,6 +1441,9 @@ echo " dmconfdir: ${dmconfdir} localstatedir: ${localstatedir} datadir: ${datadir} + g-s-d location: ${with_gnome_settings_daemon_directory} + consolekit location: ${with_consolekit_directory} ++ polkit-gnome location: ${with_polkit_gnome_directory} source code location: ${srcdir} compiler: ${CC} cflags: ${CFLAGS} -Index: gdm-2.29.1/daemon/Makefile.am +Index: gdm-2.29.4/daemon/Makefile.am =================================================================== ---- gdm-2.29.1.orig/daemon/Makefile.am -+++ gdm-2.29.1/daemon/Makefile.am +--- gdm-2.29.4.orig/daemon/Makefile.am ++++ gdm-2.29.4/daemon/Makefile.am @@ -18,6 +18,7 @@ AM_CPPFLAGS = \ -DGDM_SCREENSHOT_DIR=\"$(GDM_SCREENSHOT_DIR)\" \ -DGDM_CACHE_DIR=\""$(localstatedir)/cache/gdm"\" \ @@ -46,10 +55,10 @@ Index: gdm-2.29.1/daemon/Makefile.am $(DISABLE_DEPRECATED_CFLAGS) \ $(DAEMON_CFLAGS) \ $(XLIB_CFLAGS) \ -Index: gdm-2.29.1/daemon/gdm-server.c +Index: gdm-2.29.4/daemon/gdm-server.c =================================================================== ---- gdm-2.29.1.orig/daemon/gdm-server.c -+++ gdm-2.29.1/daemon/gdm-server.c +--- gdm-2.29.4.orig/daemon/gdm-server.c ++++ gdm-2.29.4/daemon/gdm-server.c @@ -127,7 +127,7 @@ _gdm_server_query_ck_for_display_device g_return_val_if_fail (GDM_IS_SERVER (server), NULL); @@ -59,24 +68,25 @@ Index: gdm-2.29.1/daemon/gdm-server.c server->priv->display_name); g_debug ("GdmServer: Running helper %s", command); -Index: gdm-2.29.1/data/greeter-autostart/Makefile.am +Index: gdm-2.29.4/data/greeter-autostart/Makefile.am =================================================================== ---- gdm-2.29.1.orig/data/greeter-autostart/Makefile.am -+++ gdm-2.29.1/data/greeter-autostart/Makefile.am -@@ -5,7 +5,8 @@ edit = sed \ +--- gdm-2.29.4.orig/data/greeter-autostart/Makefile.am ++++ gdm-2.29.4/data/greeter-autostart/Makefile.am +@@ -5,7 +5,9 @@ edit = sed \ -e 's|@SYSCONFDIR[@]|$(sysconfdir)|g' \ -e 's|@LIBDIR[@]|$(libdir)|g' \ -e 's|@LIBEXECDIR[@]|$(libexecdir)|g' \ - -e 's|@LOCALSTATEDIR[@]|$(localstatedir)|g' + -e 's|@LOCALSTATEDIR[@]|$(localstatedir)|g' \ -+ -e 's|@GNOME_SETTINGS_DAEMON_DIR[@]|$(GNOME_SETTINGS_DAEMON_DIR)|g' ++ -e 's|@GNOME_SETTINGS_DAEMON_DIR[@]|$(GNOME_SETTINGS_DAEMON_DIR)|g' \ ++ -e 's|@POLKIT_GNOME_DIR[@]|$(POLKIT_GNOME_DIR)|g' %.desktop.in: %.desktop.in.in Makefile $(edit) $< >$@ -Index: gdm-2.29.1/data/greeter-autostart/gnome-settings-daemon.desktop.in.in +Index: gdm-2.29.4/data/greeter-autostart/gnome-settings-daemon.desktop.in.in =================================================================== ---- gdm-2.29.1.orig/data/greeter-autostart/gnome-settings-daemon.desktop.in.in -+++ gdm-2.29.1/data/greeter-autostart/gnome-settings-daemon.desktop.in.in +--- gdm-2.29.4.orig/data/greeter-autostart/gnome-settings-daemon.desktop.in.in ++++ gdm-2.29.4/data/greeter-autostart/gnome-settings-daemon.desktop.in.in @@ -1,8 +1,8 @@ [Desktop Entry] Type=Application @@ -88,16 +98,14 @@ Index: gdm-2.29.1/data/greeter-autostart/gnome-settings-daemon.desktop.in.in OnlyShowIn=GNOME; X-GNOME-Autostart-Phase=Initialization X-GNOME-Autostart-Notify=true -Index: gdm-2.29.1/data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in +Index: gdm-2.29.4/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in =================================================================== ---- gdm-2.29.1.orig/data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in -+++ gdm-2.29.1/data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in -@@ -1,7 +1,7 @@ +--- gdm-2.29.4.orig/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in ++++ gdm-2.29.4/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in +@@ -1,5 +1,5 @@ [Desktop Entry] Type=Application - _Name=AT SPI Registry Wrapper --Exec=@LIBEXECDIR@/at-spi-registryd -+Exec=@AT_SPI_REGISTRYD_DIR@/at-spi-registryd + _Name=PolicyKit Authentication Agent +-Exec=@LIBEXECDIR@/polkit-gnome-authentication-agent-1 ++Exec=@POLKIT_GNOME_DIR@/polkit-gnome-authentication-agent-1 OnlyShowIn=GNOME; - AutostartCondition=GNOME /desktop/gnome/interface/accessibility - X-GNOME-Autostart-Phase=Initialization diff --git a/gdm-selinux.patch b/gdm-selinux.patch index 0aa2c2b..0dbf9b9 100644 --- a/gdm-selinux.patch +++ b/gdm-selinux.patch @@ -1,17 +1,21 @@ ---- configure.org 2008-12-29 09:24:05.000000000 +1100 -+++ configure 2008-12-29 09:24:19.000000000 +1100 -@@ -35527,7 +35527,7 @@ cat >>confdefs.h <<\_ACEOF - #define HAVE_SELINUX 1 - _ACEOF +Index: configure +=================================================================== +--- configure.orig ++++ configure +@@ -22413,7 +22413,7 @@ fi + + $as_echo "#define HAVE_SELINUX 1" >>confdefs.h - EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lselinux -lattr" + EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lselinux" fi ---- configure.ac.org 2008-12-29 09:25:17.000000000 +1100 -+++ configure.ac 2008-12-29 09:25:22.000000000 +1100 -@@ -873,7 +873,7 @@ if test "x$with_selinux" = "xyes" ; then +Index: configure.ac +=================================================================== +--- configure.ac.orig ++++ configure.ac +@@ -859,7 +859,7 @@ if test "x$with_selinux" = "xyes" ; then AC_CHECK_LIB(selinux,setexeccon,/bin/true) AC_CHECK_LIB(selinux,is_selinux_enabled,/bin/true) AC_DEFINE(HAVE_SELINUX, 1, [Define if have selinux]) diff --git a/gdm.changes b/gdm.changes index bd2a1e6..694f14d 100644 --- a/gdm.changes +++ b/gdm.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Thu Dec 24 17:57:48 CET 2009 - vuntz@opensuse.org + +- Add hal-devel BuildRequires to fix build. + +------------------------------------------------------------------- +Wed Dec 23 00:25:29 CET 2009 - vuntz@opensuse.org + +- Update to version 2.29.4: + + Remove deprecated function g_mapped_file_free + + Fix option widgets to work better with orca + + Make --with-custom-conf work + + Don't hard code path to policykit agent + + Don't backup xkb configuration before login +- Update gdm-helper-directory.patch: some part is now fixed + upstream, and we also need to set the right path for the + polkit-gnome agent. +- Pass --with-polkit-gnome-directory to configure. +- Update gdm-selinux.patch to apply without fuzz. + ------------------------------------------------------------------- Thu Dec 3 11:13:08 CET 2009 - vuntz@opensuse.org diff --git a/gdm.spec b/gdm.spec index ba5e213..d32221a 100644 --- a/gdm.spec +++ b/gdm.spec @@ -1,5 +1,5 @@ # -# spec file for package gdm (Version 2.29.1) +# spec file for package gdm (Version 2.29.4) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -26,6 +26,8 @@ BuildRequires: gconf2-devel BuildRequires: gnome-doc-utils-devel BuildRequires: gnome-panel-devel BuildRequires: gnome-patch-translation +# Needed for Patch32 - gdm-keyboard-from-hal.patch +BuildRequires: hal-devel BuildRequires: intltool BuildRequires: iso-codes-devel BuildRequires: libcanberra-devel @@ -42,7 +44,7 @@ BuildRequires: xorg-x11-server-extra BuildRequires: zenity License: GPLv2+ Group: System/GUI/GNOME -Version: 2.29.1 +Version: 2.29.4 Release: 1 Summary: The GNOME 2.x Display Manager Source: %{name}-%{version}.tar.bz2 @@ -168,6 +170,7 @@ autoreconf -f -i --with-at-spi-registryd-directory=%{_libexecdir}/at-spi2 \ --with-gnome-settings-daemon-directory=%{_libexecdir}/gnome-settings-daemon \ --with-consolekit-directory=%{_libexecdir}/ConsoleKit \ + --with-polkit-gnome-directory=%{_libexecdir}/polkit-gnome \ --with-selinux \ --enable-ipv6\ --disable-scrollkeeper