From 08148ad642d08d3ae6692de506c4f8546dce11f07deeb501c582c48d83b45071 Mon Sep 17 00:00:00 2001
From: OBS User buildservice-autocommit <null@suse.de>
Date: Tue, 26 Jul 2011 15:03:43 +0000
Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/xfce4-session
 revision 41.0

OBS-URL: https://build.opensuse.org/package/show/X11:xfce/xfce4-session?expand=0&rev=a20cde3f50c97ad6ff1e993515a5d3a7
---
 xfce4-session.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xfce4-session.spec b/xfce4-session.spec
index 65d6ab8..96081b7 100644
--- a/xfce4-session.spec
+++ b/xfce4-session.spec
@@ -19,7 +19,7 @@
 
 Name:           xfce4-session
 Version:        4.8.1
-Release:        11
+Release:        13
 License:        GPLv2+
 Summary:        Xfce Session manager
 Url:            http://www.xfce.org/projects/xfce4-session/

From 1421fd1bf4dc474c1ec359404883d90384add8f3fccd61fcc24d1f379709fd20 Mon Sep 17 00:00:00 2001
From: Guido Berhoerster <gber@opensuse.org>
Date: Mon, 19 Sep 2011 13:45:37 +0000
Subject: [PATCH 2/2] - update to version 4.8.2   - drop usage of
 G_CONST_RETURN macro   - don't exit the session on dbus restarts   - start
 KDE4 services instead of KDE3   - reduce size of splash engines   - remove
 the nopreview image   - add Greek manual screenshots   - on installation
 create relative paths in symlinks to images   - only perform hostname checks
 when TCP connections are enabled   - bugfixes   - translation updates -
 dropped obsolete xfce4-session-4.8.1-fix-gdm_lang-usage.patch,  
 xfce4-session-4.8.1-disable-hostname-check.patch

OBS-URL: https://build.opensuse.org/package/show/X11:xfce/xfce4-session?expand=0&rev=62
---
 ...session-4.8.1-disable-hostname-check.patch | 31 -------------------
 xfce4-session-4.8.1-fix-gdm_lang-usage.patch  | 13 --------
 xfce4-session-4.8.1.tar.bz2                   |  3 --
 xfce4-session-4.8.2.tar.bz2                   |  3 ++
 xfce4-session.changes                         | 17 ++++++++++
 xfce4-session.spec                            |  8 +----
 6 files changed, 21 insertions(+), 54 deletions(-)
 delete mode 100644 xfce4-session-4.8.1-disable-hostname-check.patch
 delete mode 100644 xfce4-session-4.8.1-fix-gdm_lang-usage.patch
 delete mode 100644 xfce4-session-4.8.1.tar.bz2
 create mode 100644 xfce4-session-4.8.2.tar.bz2

diff --git a/xfce4-session-4.8.1-disable-hostname-check.patch b/xfce4-session-4.8.1-disable-hostname-check.patch
deleted file mode 100644
index ae8d442..0000000
--- a/xfce4-session-4.8.1-disable-hostname-check.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-commit ba231e2eee82c321f473687e425d455fb36205d9
-Author: Benedikt Meurer <benedikt.meurer@googlemail.com>
-Date:   Tue Jul 26 08:19:09 2011 +0200
-
-    Only perform hostname checks when TCP connections are enabled.
-
-    Based on a patch from Guido Berhoerster <gber@opensuse.org>.
-
- xfce4-session/main.c |    9 ++++++---
- 1 files changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/xfce4-session/main.c b/xfce4-session/main.c
-index 0466f48..8f7c003 100644
---- a/xfce4-session/main.c
-+++ b/xfce4-session/main.c
-@@ -247,9 +247,12 @@ main (int argc, char **argv)
-   dpy = gdk_display_get_default ();
-   init_display (manager, dpy, channel, opt_disable_tcp);
-
--  /* verify that the DNS settings are ok */
--  xfsm_splash_screen_next (splash_screen, _("Verifying DNS settings"));
--  xfsm_dns_check ();
-+  if (!opt_disable_tcp && xfconf_channel_get_bool (channel, "/security/EnableTcp", FALSE))
-+    {
-+      /* verify that the DNS settings are ok */
-+      xfsm_splash_screen_next (splash_screen, _("Verifying DNS settings"));
-+      xfsm_dns_check ();
-+    }
-
-   xfsm_splash_screen_next (splash_screen, _("Loading session data"));
-
diff --git a/xfce4-session-4.8.1-fix-gdm_lang-usage.patch b/xfce4-session-4.8.1-fix-gdm_lang-usage.patch
deleted file mode 100644
index 90f7a04..0000000
--- a/xfce4-session-4.8.1-fix-gdm_lang-usage.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/xfce4-session/main.c b/xfce4-session/main.c
-index ff6e324..fcf69f8 100644
---- a/xfce4-session/main.c
-+++ b/xfce4-session/main.c
-@@ -103,7 +103,7 @@ setup_environment (void)
- 
-   /* this is for compatibility with the GNOME Display Manager */
-   lang = g_getenv ("GDM_LANG");
--  if (lang != NULL)
-+  if (lang != NULL && strlen (lang) > 0)
-     {
-       xfce_setenv ("LANG", lang, TRUE);
-       xfce_unsetenv ("GDM_LANG");
diff --git a/xfce4-session-4.8.1.tar.bz2 b/xfce4-session-4.8.1.tar.bz2
deleted file mode 100644
index b272b4e..0000000
--- a/xfce4-session-4.8.1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1df52a77d87ed4d27b4f40a2f03a0b6334422d64bdc4e31b9aac22e25e68b829
-size 1469105
diff --git a/xfce4-session-4.8.2.tar.bz2 b/xfce4-session-4.8.2.tar.bz2
new file mode 100644
index 0000000..153426e
--- /dev/null
+++ b/xfce4-session-4.8.2.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:31bca2a559e05a8a859f150394a901517e5842414ef171a85c5da234e344c0d0
+size 1607774
diff --git a/xfce4-session.changes b/xfce4-session.changes
index a9c6bc2..d808f38 100644
--- a/xfce4-session.changes
+++ b/xfce4-session.changes
@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Mon Sep 19 13:38:57 UTC 2011 - gber@opensuse.org
+
+- update to version 4.8.2
+  - drop usage of G_CONST_RETURN macro
+  - don't exit the session on dbus restarts
+  - start KDE4 services instead of KDE3
+  - reduce size of splash engines
+  - remove the nopreview image
+  - add Greek manual screenshots
+  - on installation create relative paths in symlinks to images
+  - only perform hostname checks when TCP connections are enabled
+  - bugfixes
+  - translation updates
+- dropped obsolete xfce4-session-4.8.1-fix-gdm_lang-usage.patch,
+  xfce4-session-4.8.1-disable-hostname-check.patch
+
 -------------------------------------------------------------------
 Tue Jul 26 07:19:25 UTC 2011 - gber@opensuse.org
 
diff --git a/xfce4-session.spec b/xfce4-session.spec
index 96081b7..5958f24 100644
--- a/xfce4-session.spec
+++ b/xfce4-session.spec
@@ -18,7 +18,7 @@
 
 
 Name:           xfce4-session
-Version:        4.8.1
+Version:        4.8.2
 Release:        13
 License:        GPLv2+
 Summary:        Xfce Session manager
@@ -27,10 +27,6 @@ Group:          System/GUI/XFCE
 Source:         %{name}-%{version}.tar.bz2
 # PATCH-FEATURE-OPENSUSE xfce4-session-simple-splash-remove-shadows.patch gber@opensuse.org -- Improves readability of the simple splash engine text by removing the text shadows
 Patch0:         xfce4-session-simple-splash-remove-shadows.patch
-# PATCH-FIX-UPSTREAM xfce4-session-4.8.1-fix-gdm_lang-usage.patch bnc#694203 bxo#7400 gber@opensuse.org -- Fixes GDM_LANG usage to be compatible with GDM3 (backported from upstream git)
-Patch1:         xfce4-session-4.8.1-fix-gdm_lang-usage.patch
-# PATCH-FIX-UPSTREAM xfce4-session-4.8.1-disable-hostname-check.patch gber@opensuse.org -- Only perform hostname checks when TCP connections are enabled (backported from upstream git)
-Patch2:         xfce4-session-4.8.1-disable-hostname-check.patch
 BuildRequires:  intltool
 BuildRequires:  perl-XML-Parser
 BuildRequires:  pkgconfig(dbus-glib-1)
@@ -91,8 +87,6 @@ This package provides the upstream look and feel for the Xfce Session Manager.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
 %configure \