From ddac525abe19583cd2627fb561b9eda45a85f49677a74ed6325d7192ecf1d222 Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Tue, 24 Aug 2010 14:11:14 +0000
Subject: [PATCH] Accepting request 45899 from
 home:dimstar:branches:GNOME:Factory

Copy from home:dimstar:branches:GNOME:Factory/gdm via accept of submit request 45899 revision 6.
Request was accepted with message:
thanks

OBS-URL: https://build.opensuse.org/request/show/45899
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=137
---
 gdm-2.21.9-no-fatal-warnings.patch | 11 ++++++-----
 gdm-2.31.2.tar.bz2                 |  3 ---
 gdm-2.31.90.tar.bz2                |  3 +++
 gdm-selinux.patch                  |  8 ++++----
 gdm.changes                        | 15 +++++++++++++++
 gdm.spec                           |  6 +++---
 6 files changed, 31 insertions(+), 15 deletions(-)
 delete mode 100644 gdm-2.31.2.tar.bz2
 create mode 100644 gdm-2.31.90.tar.bz2

diff --git a/gdm-2.21.9-no-fatal-warnings.patch b/gdm-2.21.9-no-fatal-warnings.patch
index 3dfd111..a6f282d 100644
--- a/gdm-2.21.9-no-fatal-warnings.patch
+++ b/gdm-2.21.9-no-fatal-warnings.patch
@@ -1,7 +1,8 @@
-diff -upr gdm-2.21.9-pre/common/gdm-common.c gdm-2.21.9-post/common/gdm-common.c
---- gdm-2.21.9-pre/common/gdm-common.c	2008-03-28 18:18:23.000000000 -0600
-+++ gdm-2.21.9-post/common/gdm-common.c	2008-03-28 18:35:03.000000000 -0600
-@@ -57,10 +57,12 @@ gdm_is_version_unstable (void)
+Index: gdm-2.31.90/common/gdm-common.c
+===================================================================
+--- gdm-2.31.90.orig/common/gdm-common.c
++++ gdm-2.31.90/common/gdm-common.c
+@@ -68,10 +68,12 @@ gdm_is_version_unstable (void)
  void
  gdm_set_fatal_warnings_if_unstable (void)
  {
@@ -13,4 +14,4 @@ diff -upr gdm-2.21.9-pre/common/gdm-common.c gdm-2.21.9-post/common/gdm-common.c
 +#endif
  }
  
- int
+ gboolean
diff --git a/gdm-2.31.2.tar.bz2 b/gdm-2.31.2.tar.bz2
deleted file mode 100644
index 311411c..0000000
--- a/gdm-2.31.2.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5e8ff63fbc1932d524166c363d8cff7fc40785caed6b086533edfa3572ef84aa
-size 2378650
diff --git a/gdm-2.31.90.tar.bz2 b/gdm-2.31.90.tar.bz2
new file mode 100644
index 0000000..b1608ec
--- /dev/null
+++ b/gdm-2.31.90.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:90bbef4b6361ac41de18544e4eb4547087b72e9817cb3804457db4fc65d71b58
+size 2473664
diff --git a/gdm-selinux.patch b/gdm-selinux.patch
index 5056548..d1c95ba 100644
--- a/gdm-selinux.patch
+++ b/gdm-selinux.patch
@@ -2,9 +2,9 @@ Index: configure
 ===================================================================
 --- configure.orig
 +++ configure
-@@ -31058,7 +31058,7 @@ cat >>confdefs.h <<\_ACEOF
- #define HAVE_SELINUX 1
- _ACEOF
+@@ -22287,7 +22287,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"
@@ -15,7 +15,7 @@ Index: configure.ac
 ===================================================================
 --- configure.ac.orig
 +++ configure.ac
-@@ -868,7 +868,7 @@ if test "x$with_selinux" = "xyes" ; then
+@@ -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 84be5c5..0d80912 100644
--- a/gdm.changes
+++ b/gdm.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Wed Aug 18 10:13:35 CEST 2010 - dimstar@opensuse.org
+
+- Update to version 2.31.90:
+  + Port to upower
+  + Don't stomp on $LANGUAGE environment variable
+  + Don't show markup in UI
+  + Fix cancel button
+  + Reask user for password a few times, before failing
+  + Load users asynchronously
+  + Handle EINTR on getpw* calls
+  + Translation updates
+- Replace DeviceKit-power-devel BuildRequires with
+  libupower-glib-devel.
+
 -------------------------------------------------------------------
 Sun Aug  8 05:18:29 CEST 2010 - vuntz@opensuse.org
 
diff --git a/gdm.spec b/gdm.spec
index cc93a3e..35a6c0f 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package gdm (Version 2.31.2)
+# spec file for package gdm (Version 2.31.90)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -19,7 +19,6 @@
 
 
 Name:           gdm
-BuildRequires:  DeviceKit-power-devel
 BuildRequires:  check-devel
 BuildRequires:  fdupes
 BuildRequires:  gconf2-devel
@@ -30,6 +29,7 @@ BuildRequires:  intltool
 BuildRequires:  iso-codes-devel
 BuildRequires:  libcanberra-devel
 BuildRequires:  libselinux-devel
+BuildRequires:  libupower-glib-devel
 BuildRequires:  libxklavier-devel
 BuildRequires:  pam-devel
 BuildRequires:  pwdutils
@@ -41,7 +41,7 @@ BuildRequires:  xorg-x11-server-extra
 BuildRequires:  zenity
 License:        GPLv2+
 Group:          System/GUI/GNOME
-Version:        2.31.2
+Version:        2.31.90
 Release:        1
 Summary:        The GNOME 2.x Display Manager
 Source:         %{name}-%{version}.tar.bz2