From 812d85f84bc3a4c8c70ff269ad6ab1b890e21542ba624bff2c0c681f48ec60f1 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Tue, 24 Sep 2013 20:03:59 +0000
Subject: [PATCH 1/2] Accepting request 200372 from
 home:dimstar:branches:GNOME:Factory

Update to 3.10.0

OBS-URL: https://build.opensuse.org/request/show/200372
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=253
---
 autogen.sh        | 28 ++++++++++++++++++++++++++++
 gdm-3.10.0.tar.xz |  3 +++
 gdm-3.9.92.tar.xz |  3 ---
 gdm.changes       | 11 +++++++++++
 gdm.spec          |  8 +++++---
 5 files changed, 47 insertions(+), 6 deletions(-)
 create mode 100644 autogen.sh
 create mode 100644 gdm-3.10.0.tar.xz
 delete mode 100644 gdm-3.9.92.tar.xz

diff --git a/autogen.sh b/autogen.sh
new file mode 100644
index 0000000..d17320b
--- /dev/null
+++ b/autogen.sh
@@ -0,0 +1,28 @@
+#!/bin/sh
+# Run this to generate all the initial makefiles, etc.
+
+test -n "$srcdir" || srcdir=`dirname "$0"`
+test -n "$srcdir" || srcdir=.
+
+olddir=`pwd`
+cd $srcdir
+
+AUTORECONF=`which autoreconf`
+if test -z $AUTORECONF; then
+        echo "*** No autoreconf found, please intall it ***"
+        exit 1
+fi
+
+INTLTOOLIZE=`which intltoolize`
+if test -z $INTLTOOLIZE; then
+        echo "*** No intltoolize found, please install the intltool package ***"
+        exit 1
+fi
+
+autopoint --force
+AUTOPOINT='intltoolize --automake --copy' autoreconf --force --install --verbose
+
+cd $olddir
+test -n "$NOCONFIGURE" || "$srcdir/configure" "$@"
+
+
diff --git a/gdm-3.10.0.tar.xz b/gdm-3.10.0.tar.xz
new file mode 100644
index 0000000..f0afebe
--- /dev/null
+++ b/gdm-3.10.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bb04600298f5be795f0d0bfea40bbd9bf78f95a44c5caeda4d0cc6a05207318c
+size 1571812
diff --git a/gdm-3.9.92.tar.xz b/gdm-3.9.92.tar.xz
deleted file mode 100644
index 15cd801..0000000
--- a/gdm-3.9.92.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ba9035a943f58ca3c9e14c5a3891642a8725f244765d53599b73d5fccdc4d9d8
-size 1572044
diff --git a/gdm.changes b/gdm.changes
index ab90974..9da040a 100644
--- a/gdm.changes
+++ b/gdm.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Tue Sep 24 07:45:41 UTC 2013 - dimstar@opensuse.org
+
+- Update to version 3.10.0:
+  + Updated translations.
+- Add autogen.sh as source (extracted from git). GDM actually does
+  not use gnome-autogen.sh to bootstrap; this just happened to work
+  so far. The correct way is to use upstreams autogen.sh script.
+- Replace gnome-autogen.sh call with autogen.sh (based on added
+  source).
+
 -------------------------------------------------------------------
 Thu Sep 19 20:29:23 UTC 2013 - dimstar@opensuse.org
 
diff --git a/gdm.spec b/gdm.spec
index 6fc73ca..ff5b5db 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -27,13 +27,13 @@
 %define enable_split_authentication 0
 
 Name:           gdm
-Version:        3.9.92
+Version:        3.10.0
 Release:        0
 Summary:        The GNOME Display Manager
 License:        GPL-2.0+
 Group:          System/GUI/GNOME
 Url:            http://projects.gnome.org/gdm/
-Source:         http://download.gnome.org/sources/gdm/3.9/%{name}-%{version}.tar.xz
+Source:         http://download.gnome.org/sources/gdm/3.10/%{name}-%{version}.tar.xz
 Source1:        gdm.pamd
 Source2:        gdm-autologin.pamd
 Source3:        gdm-launch-environment.pamd
@@ -43,6 +43,8 @@ Source7:        gdm-smartcard.pamd
 Source4:        gdmflexiserver-wrapper
 # /etc/xinit.d/xdm integration script
 Source5:        X11-displaymanager-gdm
+# GDM does not boostrap using gnome-autogen.sh, but has it's own bootstrap script
+Source8:        autogen.sh
 # PATCH-FIX-OPENSUSE gdm-is-not-unstable-unless.patch vuntz@opensuse.org -- Make gdm think it's never running a development version unless SUSE_ENABLE_UNSTABLE_CHECK is set. This disables fatal warnings as well as abusive log
 Patch3:         gdm-is-not-unstable-unless.patch
 # PATCH-NEEDS-REBASE PATCH-FIX-OPENSUSE gdm-desktop-session-env-pam.patch bnc427744 vuntz@novell.com -- Sets a PAM environment variable to let the pam gnome-keyring module know which session is started
@@ -204,7 +206,7 @@ translation-update-upstream
 %patch40 -p1
 
 %build
-NOCONFIGURE=1 gnome-autogen.sh
+NOCONFIGURE=1 sh %{S:8}
 %configure\
         --disable-static \
         --libexecdir=%{_prefix}/lib/gdm \

From e8126de40b61c30e4817d1667644c8d5ece9387f7e7d1f735a1b359bbcf53ac6 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Thu, 26 Sep 2013 07:57:03 +0000
Subject: [PATCH 2/2] Accepting request 200645 from
 home:vuntz:branches:GNOME:Factory

Get rid of metacity & polkit-gnome on default install

OBS-URL: https://build.opensuse.org/request/show/200645
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=254
---
 gdm.changes | 10 ++++++++++
 gdm.spec    | 15 +++------------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/gdm.changes b/gdm.changes
index 9da040a..5aba0e7 100644
--- a/gdm.changes
+++ b/gdm.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu Sep 26 06:48:23 UTC 2013 - vuntz@suse.com
+
+- Remove dependencies from the old days:
+  + No metacity nor polkit-gnome Requires: this was for fallback
+    mode.
+  + Promote gnome-shell from Recommends to Requires.
+  + Drop commented out accessibility Recommends (gnome-mag, gok)
+    from GNOME 2.x.
+
 -------------------------------------------------------------------
 Tue Sep 24 07:45:41 UTC 2013 - dimstar@opensuse.org
 
diff --git a/gdm.spec b/gdm.spec
index ff5b5db..49af0d8 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -98,20 +98,11 @@ Requires:       ConsoleKit-x11
 %endif
 Requires:       gdmflexiserver
 Requires:       gnome-session-core
-Requires:       xorg-x11-server-extra
-### Packages for the gdm session (see /usr/share/gnome-session/sessions/{gdm,gdm-fallback}.session and /usr/share/gdm/greeter/applications)
-## Fallback
-Requires:       metacity
-Requires:       polkit-gnome
-## Non-fallback
-# Use Recommends, since we do not want to force people to install gnome-shell, and if it's not there, the fallback session will be used
-Recommends:     gnome-shell
-## All sessions
 Requires:       gnome-settings-daemon
+Requires:       gnome-shell
+Requires:       xorg-x11-server-extra
 Requires(post): dconf
-# Those accessibility features rely on deprecated modules that we don't ship :/ See bgo#658429.
-#Recommends:     gnome-mag
-#Recommends:     gok
+# accessibility
 Recommends:     orca
 # For groupadd, useradd, usermod
 PreReq:         pwdutils