commit xfce4-session for openSUSE:12.1:Update:Test

2012-01-17 Thread h_root
Hello community,

here is the log from the commit of package xfce4-session for 
openSUSE:12.1:Update:Test checked in at 2012-01-16 01:37:59

Comparing /work/SRC/openSUSE:12.1:Update:Test/xfce4-session (Old)
 and  /work/SRC/openSUSE:12.1:Update:Test/.xfce4-session.new (New)


Package is xfce4-session, Maintainer is xfce-maintain...@suse.de

Changes:

--- /work/SRC/openSUSE:12.1:Update:Test/xfce4-session/xfce4-session.changes 
2011-11-24 20:16:07.0 +0100
+++ 
/work/SRC/openSUSE:12.1:Update:Test/.xfce4-session.new/xfce4-session.changes
2012-01-17 16:26:13.0 +0100
@@ -1,0 +2,8 @@
+Tue Jan 10 16:11:36 UTC 2012 - g...@opensuse.org
+
+- added xfce4-session-lock-screen-on-suspend-hibernate.patch in
+  order to try to locking the screen when hibernating/suspending
+  when xfce4-power-manager is configured to do so (bnc#740566,
+  bxo#6019)
+
+---

New:

  xfce4-session-lock-screen-on-suspend-hibernate.patch



Other differences:
--
++ xfce4-session.spec ++
--- /var/tmp/diff_new_pack.F3iaMq/_old  2012-01-17 16:26:14.0 +0100
+++ /var/tmp/diff_new_pack.F3iaMq/_new  2012-01-17 16:26:14.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package xfce4-session
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,37 +15,37 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
-
 Name:   xfce4-session
 Version:4.8.2
-Release:13
-License:GPLv2+
+Release:0
 Summary:Xfce Session manager
-Url:http://www.xfce.org/projects/xfce4-session/
+License:GPL-2.0+
 Group:  System/GUI/XFCE
+Url:http://www.xfce.org/projects/xfce4-session/
 Source: %{name}-%{version}.tar.bz2
 # PATCH-FEATURE-OPENSUSE xfce4-session-simple-splash-remove-shadows.patch 
g...@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-fix-gnome-mode.patch bnc#710038 bxo#8014 
g...@opensuse.org -- Removes obsolete GNOME compatibility code, treats 
GNOME-/KDE-only autostart files as inactive, and allows to enable them through 
xfce4-session-settings
 Patch1: xfce4-session-fix-gnome-mode.patch
+# PATCH-FEATURE-UPSTREAM xfce4-session-lock-screen-on-suspend-hibernate.patch 
bxo#6019 g...@opensuse.org -- Try to lock the screen when hibernating/suspending
+Patch2: xfce4-session-lock-screen-on-suspend-hibernate.patch
+BuildRequires:  docbook-xsl-stylesheets
+BuildRequires:  docbook_4
 BuildRequires:  intltool
+BuildRequires:  libxslt
 BuildRequires:  perl-XML-Parser
+BuildRequires:  update-desktop-files
+BuildRequires:  xml2po
+BuildRequires:  xorg-x11
 BuildRequires:  pkgconfig(dbus-glib-1)
+BuildRequires:  pkgconfig(gconf-2.0)
+BuildRequires:  pkgconfig(gnome-keyring-1)
 BuildRequires:  pkgconfig(libwnck-1.0)
+BuildRequires:  pkgconfig(libxfce4panel-1.0)
 BuildRequires:  pkgconfig(libxfce4ui-1)
 BuildRequires:  pkgconfig(libxfce4util-1.0)
-BuildRequires:  pkgconfig(libxfce4panel-1.0)
 BuildRequires:  pkgconfig(libxfcegui4-1.0)
 BuildRequires:  pkgconfig(libxfconf-0)
-BuildRequires:  pkgconfig(gconf-2.0)
-BuildRequires:  pkgconfig(gnome-keyring-1)
-BuildRequires:  update-desktop-files
-BuildRequires:  xorg-x11
-BuildRequires:  libxslt
-BuildRequires:  xml2po
-BuildRequires:  docbook_4
-BuildRequires:  docbook-xsl-stylesheets
 Requires:   %{name}-branding = %{version}
 Requires:   xfce-utils
 Recommends: fortune
@@ -55,7 +55,6 @@
 xfce4-session is the session manager for the Xfce desktop environment.
 
 %packagedevel
-License:GPLv2+
 Summary:Development files for xfce4-session
 Group:  Development/Libraries/C and C++
 Requires:   %{name} = %{version}
@@ -72,8 +71,8 @@
 This package contains development files needed to develop custom splash themes.
 
 %package branding-upstream
-License:GPLv2+
 Summary:Upstream branding of xfce4-session
+Group:  System/GUI/XFCE
 Supplements:packageand(%{name}:branding-upstream)
 Provides:   %{name}-branding = %{version}
 Conflicts:  otherproviders(%{name}-branding)
@@ -90,6 +89,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %configure \

++ xfce4-session-lock-screen-on-suspend-hibernate.patch ++
Index: xfce4-session-4.8.2/xfce4-session/xfsm-shutdown-helper.c

commit xfce4-session for openSUSE:12.1:Update:Test

2011-11-22 Thread h_root
Hello community,

here is the log from the commit of package xfce4-session for 
openSUSE:12.1:Update:Test checked in at 2011-11-22 17:28:48

Comparing /work/SRC/openSUSE:12.1:Update:Test/xfce4-session (Old)
 and  /work/SRC/openSUSE:12.1:Update:Test/.xfce4-session.new (New)


Package is xfce4-session, Maintainer is xfce-maintain...@suse.de

Changes:

--- /work/SRC/openSUSE:12.1:Update:Test/xfce4-session/xfce4-session.changes 
2011-11-22 17:28:49.0 +0100
+++ 
/work/SRC/openSUSE:12.1:Update:Test/.xfce4-session.new/xfce4-session.changes
2011-11-22 17:28:49.0 +0100
@@ -1,0 +2,6 @@
+Sun Nov 13 17:33:24 UTC 2011 - g...@opensuse.org
+
+- fixed xfce4-session-fix-gnome-mode.patch to prevent NULL pointer
+  dereference on invalid autostart files (bnc#730059)
+
+---



Other differences:
--
++ xfce4-session-fix-gnome-mode.patch ++
--- /var/tmp/diff_new_pack.CYTAlC/_old  2011-11-22 17:28:50.0 +0100
+++ /var/tmp/diff_new_pack.CYTAlC/_new  2011-11-22 17:28:50.0 +0100
@@ -1,6 +1,6 @@
 diff -urNp xfce4-session-4.8.2.orig/settings/xfae-model.c 
xfce4-session-4.8.2/settings/xfae-model.c
 --- xfce4-session-4.8.2.orig/settings/xfae-model.c 2011-09-13 
18:17:10.0 +0200
-+++ xfce4-session-4.8.2/settings/xfae-model.c  2011-10-08 17:37:29.0 
+0200
 xfce4-session-4.8.2/settings/xfae-model.c  2011-11-13 17:45:34.0 
+0100
 @@ -73,6 +73,7 @@ static gboolean   xfae_model_ite
  static XfaeItem  *xfae_item_new   (const gchar
*relpath);
  static void   xfae_item_free  (XfaeItem   
*item);
@@ -34,32 +34,69 @@
gchar  **not_show_in;
gchar  **args;
gchar   *icon_name;
-@@ -457,18 +458,18 @@ xfae_item_new (const gchar *relpath)
- }
+@@ -454,37 +455,37 @@ xfae_item_new (const gchar *relpath)
+ item-comment = g_strdup (value);
  
-   /* check the OnlyShowIn setting */
+   item-hidden = xfce_rc_read_bool_entry (rc, Hidden, FALSE);
+-}
+-
+-  /* check the OnlyShowIn setting */
 -  only_show_in = xfce_rc_read_list_entry (rc, OnlyShowIn, ;);
 -  if (G_UNLIKELY (only_show_in != NULL))
-+  item-only_show_in = xfce_rc_read_list_entry (rc, OnlyShowIn, ;);
-+  if (G_UNLIKELY (item-only_show_in != NULL))
- {
+-{
 -  /* check if Xfce is specified */
 -  for (m = 0, skip = TRUE; only_show_in[m] != NULL; ++m)
 -if (g_ascii_strcasecmp (only_show_in[m], Xfce) == 0)
-+  /* check if Xfce, GNOME, or KDE are specified */
-+  for (m = 0, skip = TRUE; item-only_show_in[m] != NULL; ++m)
-+if ((g_ascii_strcasecmp (item-only_show_in[m], Xfce) == 0) ||
-+(g_ascii_strcasecmp (item-only_show_in[m], GNOME) == 0) ||
-+(g_ascii_strcasecmp (item-only_show_in[m], KDE) == 0))
-   {
- skip = FALSE;
- break;
-   }
--
+-  {
+-skip = FALSE;
+-break;
+-  }
+ 
 -  g_strfreev (only_show_in);
+-}
+-  else
+-{
+-  /* check the NotShowIn setting */
+-  not_show_in = xfce_rc_read_list_entry (rc, NotShowIn, ;);
+-  if (G_UNLIKELY (not_show_in != NULL))
++  /* check the OnlyShowIn setting */
++  item-only_show_in = xfce_rc_read_list_entry (rc, OnlyShowIn, 
;);
++  if (G_UNLIKELY (item-only_show_in != NULL))
+ {
+-  /* check if Xfce is not specified */
+-  for (m = 0; not_show_in[m] != NULL; ++m)
+-if (g_ascii_strcasecmp (not_show_in[m], Xfce) == 0)
++  /* check if Xfce, GNOME, or KDE are specified */
++  for (m = 0, skip = TRUE; item-only_show_in[m] != NULL; ++m)
++if ((g_ascii_strcasecmp (item-only_show_in[m], Xfce) == 0) 
||
++(g_ascii_strcasecmp (item-only_show_in[m], GNOME) == 
0) ||
++(g_ascii_strcasecmp (item-only_show_in[m], KDE) == 0))
+   {
+-skip = TRUE;
++skip = FALSE;
+ break;
+   }
++}
++  else
++{
++  /* check the NotShowIn setting */
++  not_show_in = xfce_rc_read_list_entry (rc, NotShowIn, ;);
++  if (G_UNLIKELY (not_show_in != NULL))
++{
++  /* check if Xfce is not specified */
++  for (m = 0; not_show_in[m] != NULL; ++m)
++if (g_ascii_strcasecmp (not_show_in[m], Xfce) == 0)
++  {