rpm/xfce4-session
SHA256
1
0
Fork 0
forked from pool/xfce4-session
Code Pull Requests Activity

Accepting request 115659 from X11:xfce:UNSTABLE

Browse Source 
merge from X11:xfce:UNSTABLE

OBS-URL: https://build.opensuse.org/request/show/115659
OBS-URL: https://build.opensuse.org/package/show/X11:xfce/xfce4-session?expand=0&rev=93
This commit is contained in:
Guido Berhoerster 2012-04-26 09:14:31 +00:00 committed by Git OBS Bridge
parent b3921b1a0e
commit 7e6556dd0c
8 changed files with 155 additions and 384 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
xfce4-session-4.8.3.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f0801b8c0ffa7e5d41b29b8df281ac127adf467bf50e8ded8aebe5a02bd99338
size 1594643

3
xfce4-session-4.9.2.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a7a3343ea25c6ea8c2a987a1189268a9467408218720ebfebd0f428a11c35567
size 1256366

46
xfce4-session-adapt-session-script.patch Normal file
View File

@ -0,0 +1,46 @@
Index: xfce4-session-4.9.0/scripts/xinitrc.in
===================================================================
--- xfce4-session-4.9.0.orig/scripts/xinitrc.in
+++ xfce4-session-4.9.0/scripts/xinitrc.in
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# fix broken $UID on some system...
if test "x$UID" = "x"; then
@@ -38,12 +38,6 @@ if test "x$XDG_CACHE_HOME" = "x" ; then
fi
[ -d "$XDG_CACHE_HOME" ] || mkdir "$XDG_CACHE_HOME"
-# set up XDG user directores. see
-# http://freedesktop.org/wiki/Software/xdg-user-dirs
-if which xdg-user-dirs-update >/dev/null 2>&1; then
- xdg-user-dirs-update
-fi
-
# Modify libglade and glade environment variables so that
# it will find the files installed by Xfce
GLADE_CATALOG_PATH="$GLADE_CATALOG_PATH:/usr/share/glade3/catalogs"
Index: xfce4-session-4.9.0/scripts/xinitrc.in.in
===================================================================
--- xfce4-session-4.9.0.orig/scripts/xinitrc.in.in
+++ xfce4-session-4.9.0/scripts/xinitrc.in.in
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# fix broken $UID on some system...
if test "x$UID" = "x"; then
@@ -38,12 +38,6 @@ if test "x$XDG_CACHE_HOME" = "x" ; then
fi
[ -d "$XDG_CACHE_HOME" ] || mkdir "$XDG_CACHE_HOME"
-# set up XDG user directores. see
-# http://freedesktop.org/wiki/Software/xdg-user-dirs
-if which xdg-user-dirs-update >/dev/null 2>&1; then
- xdg-user-dirs-update
-fi
-
# Modify libglade and glade environment variables so that
# it will find the files installed by Xfce
GLADE_CATALOG_PATH="$GLADE_CATALOG_PATH:@XFCE_GLADE_CATALOG_PATH@"

212
xfce4-session-fix-gnome-mode.patch
View File

@ -1,212 +0,0 @@
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.000000000 +0200
+++ xfce4-session-4.8.2/settings/xfae-model.c 2011-11-13 17:45:34.000000000 +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);
static gboolean xfae_item_is_removable (XfaeItem *item);
+static gboolean xfae_item_is_compat (XfaeItem *item);
@@ -95,6 +96,7 @@ struct _XfaeItem
GdkPixbuf *icon;
gchar *comment;
gchar *relpath;
+ gchar **only_show_in;
gboolean hidden;
};
@@ -287,7 +289,7 @@ xfae_model_get_value (GtkTreeModel *tree
case XFAE_MODEL_COLUMN_ENABLED:
g_value_init (value, G_TYPE_BOOLEAN);
- g_value_set_boolean (value, !item->hidden);
+ g_value_set_boolean (value, !(item->hidden || xfae_item_is_compat (item)));
break;
case XFAE_MODEL_COLUMN_REMOVABLE:
@@ -401,7 +403,6 @@ xfae_item_new (const gchar *relpath)
XfaeItem *item = NULL;
gboolean skip = FALSE;
XfceRc *rc;
- gchar **only_show_in;
gchar **not_show_in;
gchar **args;
gchar *icon_name;
@@ -454,37 +455,37 @@ xfae_item_new (const gchar *relpath)
item->comment = g_strdup (value);
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))
- {
- /* 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)
- {
- 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)
+ {
+ skip = TRUE;
+ break;
+ }
- g_strfreev (not_show_in);
+ g_strfreev (not_show_in);
+ }
}
}
@@ -515,6 +516,7 @@ xfae_item_free (XfaeItem *item)
g_free (item->relpath);
g_free (item->comment);
g_free (item->name);
+ g_strfreev (item->only_show_in);
g_free (item);
}
@@ -545,6 +547,32 @@ xfae_item_is_removable (XfaeItem *item)
static gboolean
+xfae_item_is_compat (XfaeItem *item)
+{
+ gint m;
+ gboolean is_compat = FALSE;
+
+ if (item->only_show_in != NULL)
+ {
+ for (m = 0; item->only_show_in[m] != NULL; ++m)
+ {
+ if (g_ascii_strcasecmp (item->only_show_in[m], "Xfce") == 0)
+ {
+ is_compat = FALSE;
+ break;
+ }
+ else if ((g_ascii_strcasecmp (item->only_show_in[m], "GNOME") == 0) ||
+ (g_ascii_strcasecmp (item->only_show_in[m], "KDE") == 0))
+ is_compat = TRUE;
+ }
+ }
+
+ return is_compat;
+}
+
+
+
+static gboolean
xfae_item_remove (XfaeItem *item,
GError **error)
{
@@ -899,12 +927,26 @@ xfae_model_toggle (XfaeModel *model,
return FALSE;
}
- /* perform the toggle operation :-) */
- item->hidden = !item->hidden;
+ if (xfae_item_is_compat (item))
+ {
+ guint len;
+
+ /* append "XFCE;" to "OnlyShowIn" */
+ len = g_strv_length (item->only_show_in) + 2;
+ item->only_show_in = g_realloc_n (item->only_show_in, (gsize) len, sizeof (gchar *));
+ item->only_show_in[len - 3] = g_strdup ("XFCE");
+ item->only_show_in[len - 2] = g_strdup (""); /* force trailing semicolon */
+ item->only_show_in[len - 1] = NULL;
+
+ item->hidden = FALSE;
+ }
+ else
+ item->hidden = !item->hidden;
/* write the result */
xfce_rc_set_group (rc, "Desktop Entry");
xfce_rc_write_bool_entry (rc, "Hidden", item->hidden);
+ xfce_rc_write_list_entry (rc, "OnlyShowIn", item->only_show_in, ";");
xfce_rc_close (rc);
/* tell the view that we have most probably a new state */
diff -urNp xfce4-session-4.8.2.orig/xfce4-session/xfsm-compat-gnome.c xfce4-session-4.8.2/xfce4-session/xfsm-compat-gnome.c
--- xfce4-session-4.8.2.orig/xfce4-session/xfsm-compat-gnome.c 2011-09-13 18:17:17.000000000 +0200
+++ xfce4-session-4.8.2/xfce4-session/xfsm-compat-gnome.c 2011-11-13 17:32:37.000000000 +0100
@@ -294,7 +294,9 @@ xfsm_compat_gnome_startup (XfsmSplashScr
if (G_UNLIKELY (gnome_compat_started))
return;
+#if 0
xfsm_compat_gnome_smproxy_startup ();
+#endif
/* fire up the keyring daemon */
if (G_LIKELY (splash != NULL))
@@ -342,6 +344,7 @@ xfsm_compat_gnome_shutdown (void)
}
#endif
+#if 0
/* shutdown the GConf daemon */
if (!g_spawn_command_line_sync ("gconftool-2 --shutdown", NULL,
NULL, &status, &error))
@@ -357,6 +360,7 @@ xfsm_compat_gnome_shutdown (void)
}
xfsm_compat_gnome_smproxy_shutdown ();
+#endif
gnome_compat_started = FALSE;
}
diff -urNp xfce4-session-4.8.2.orig/xfce4-session/xfsm-startup.c xfce4-session-4.8.2/xfce4-session/xfsm-startup.c
--- xfce4-session-4.8.2.orig/xfce4-session/xfsm-startup.c 2011-09-13 18:17:17.000000000 +0200
+++ xfce4-session-4.8.2/xfce4-session/xfsm-startup.c 2011-11-13 17:32:37.000000000 +0100
@@ -352,9 +352,7 @@ xfsm_startup_autostart_xdg (XfsmManager
* then "KDE" is specified. */
for (m = 0, skip = TRUE; only_show_in[m] != NULL; ++m)
{
- if ((g_ascii_strcasecmp (only_show_in[m], "XFCE") == 0) ||
- (gnome && g_ascii_strcasecmp (only_show_in[m], "GNOME") == 0) ||
- (kde && g_ascii_strcasecmp (only_show_in[m], "KDE") == 0))
+ if (g_ascii_strcasecmp (only_show_in[m], "XFCE") == 0)
{
skip = FALSE;
break;

56
xfce4-session-lock-screen-on-suspend-hibernate.patch
View File

@ -1,56 +0,0 @@
Index: xfce4-session-4.8.2/xfce4-session/xfsm-shutdown-helper.c
===================================================================
--- xfce4-session-4.8.2.orig/xfce4-session/xfsm-shutdown-helper.c
+++ xfce4-session-4.8.2/xfce4-session/xfsm-shutdown-helper.c
@@ -71,6 +71,8 @@
#include <libxfce4util/libxfce4util.h>
+#include <xfconf/xfconf.h>
+
#include "xfsm-shutdown-helper.h"
#include "xfsm-global.h"
@@ -1722,6 +1724,24 @@ gboolean xfsm_shutdown_helper_send_passw
return TRUE;
}
+static void
+lock_screen (void)
+{
+ XfconfChannel *channel;
+ gboolean ret;
+ gint exit_status;
+
+ channel = xfconf_channel_get ("xfce4-power-manager");
+ if (xfconf_channel_get_bool (channel, "/xfce4-power-manager/lock-screen-suspend-hibernate", TRUE))
+ {
+ ret = g_spawn_command_line_sync ("xflock4", NULL, NULL, &exit_status, NULL);
+ if (!ret || exit_status != 0)
+ {
+ g_warning ("Could not lock screen");
+ }
+ }
+}
+
/**
* xfsm_shutdown_helper_shutdown:
*
@@ -1785,6 +1805,8 @@ gboolean xfsm_shutdown_helper_suspend (X
{
g_return_val_if_fail (!error || !*error, FALSE);
+ lock_screen ();
+
#ifdef ENABLE_UPOWER
if ( helper->sleep_backend == XFSM_SLEEP_BACKEND_UPOWER )
{
@@ -1812,6 +1834,8 @@ gboolean xfsm_shutdown_helper_hibernate
{
g_return_val_if_fail (!error || !*error, FALSE);
+ lock_screen ();
+
#ifdef ENABLE_UPOWER
if ( helper->sleep_backend == XFSM_SLEEP_BACKEND_UPOWER )
{

74
xfce4-session-respect-session-save-setting.patch
View File

@ -1,74 +0,0 @@
From d7311f2dcedd96f5833acceb27f9d17275893e1e Mon Sep 17 00:00:00 2001
From: Lionel Le Folgoc <lionel@lefolgoc.net>
Date: Thu, 25 Aug 2011 14:22:24 +0200
Subject: Do not always save session with xfce4-logout-plugin (Bug #7915)
Respect the value of the "/general/SaveOnExit" option from xfce4-session in the
logout panel plugin as well.
Bug: https://bugzilla.xfce.org/show_bug.cgi?id=7915
---
panel-plugin/Makefile.am | 2 ++
panel-plugin/xfsm-logout-plugin.c | 14 +++++++++++++-
2 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index 0675e2e..fd0609b 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -18,6 +18,7 @@ libxfsm_logout_plugin_la_SOURCES = \
libxfsm_logout_plugin_la_CFLAGS = \
$(LIBX11_CFLAGS) \
$(LIBXFCE4PANEL_CFLAGS) \
+ $(XFCONF_CFLAGS) \
$(LIBXFCE4UTIL_CFLAGS) \
$(LIBXFCE4UI_CFLAGS) \
$(GTK_CFLAGS) \
@@ -26,6 +27,7 @@ libxfsm_logout_plugin_la_CFLAGS = \
libxfsm_logout_plugin_la_LIBADD = \
$(LIBX11_LIBS) \
$(LIBXFCE4PANEL_LIBS) \
+ $(XFCONF_LIBS) \
$(LIBXFCE4UTIL_LIBS) \
$(LIBXFCE4UI_LIBS) \
$(GTK_LIBS) \
diff --git a/panel-plugin/xfsm-logout-plugin.c b/panel-plugin/xfsm-logout-plugin.c
index b8e25ab..12dec0f 100644
--- a/panel-plugin/xfsm-logout-plugin.c
+++ b/panel-plugin/xfsm-logout-plugin.c
@@ -43,6 +43,7 @@
#include <libxfce4util/libxfce4util.h>
#include <libxfce4ui/libxfce4ui.h>
+#include <xfconf/xfconf.h>
#include <libxfce4panel/libxfce4panel.h>
#include "xfsm-logout-plugin-ui.h"
@@ -207,12 +208,23 @@ static void
xfsm_logout_plugin_show_confirmation_dialog(XfsmLogoutPlugin *logout_plugin,
XfsmShutdownType type)
{
+ GError *error = NULL;
+ XfconfChannel *channel;
gint resp = GTK_RESPONSE_ACCEPT;
g_return_if_fail(logout_plugin != NULL);
g_return_if_fail(type >= XFSM_SHUTDOWN_LOGOUT && type <= XFSM_SHUTDOWN_HIBERNATE);
- logout_plugin->allow_save = TRUE;
+ if (G_UNLIKELY (!xfconf_init (&error))) {
+ g_warning ("Unable to contact settings server: %s", error->message);
+ g_error_free (error);
+ logout_plugin->allow_save = TRUE;
+ }
+ else {
+ channel = xfconf_channel_get ("xfce4-session");
+ logout_plugin->allow_save = xfconf_channel_get_bool (channel, "/general/SaveOnExit", TRUE);
+ xfconf_shutdown ();
+ }
if(type != XFSM_SHUTDOWN_SUSPEND && type != XFSM_SHUTDOWN_HIBERNATE) {
GtkWidget *dialog, *topvbox, *hbox, *image, *label;
--
1.7.2.5

76
xfce4-session.changes
View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Fri Apr 20 13:45:50 UTC 2012 - gber@opensuse.org
- update to version 4.9.2
- make the buttons sensitive when using sudo
- restore ssh and gpg agent starting
- translation updates
-------------------------------------------------------------------
Thu Apr 19 21:51:58 UTC 2012 - gber@opensuse.org
- obsolete all xfce-utils subpackages packages properly
- obsolete xfce4-session-doc as well
-------------------------------------------------------------------
Thu Apr 19 12:59:20 UTC 2012 - gber@opensuse.org
@ -8,6 +22,68 @@ Thu Apr 19 08:43:03 UTC 2012 - gber@opensuse.org
- let -devel depend on libxfsm-4_6-0 rather than the main package
-------------------------------------------------------------------
Sat Apr 14 16:22:29 UTC 2012 - gber@opensuse.org
- removed leftover dependency on xfce-utils
- recommend a minimal selection of packages for a Xfce session
-------------------------------------------------------------------
Sat Apr 14 10:31:48 UTC 2012 - gber@opensuse.org
- update to version 4.9.1
- fix return value of CanSuspend and CanHibernate
- make common no-reply error more subtile
- bump package dependency versions
- remove deprecated or unused code from xinit
- fallback to old method for shutdown
- improve xflock4 script
- drop the sync code because it can segfault on ext2
- always escape name and comment in dialog
- translation updates
- drop xflock4.sh which has been included upstream
-------------------------------------------------------------------
Sun Apr 8 15:25:47 UTC 2012 - gber@opensuse.org
- update to version 4.9.0
- add accelerators to logout dialog buttons
- add support for starting assistive technologies
- remove optional dependency for gconf
- remove Xfce4-tips
- remove early xfsettingsd autostart and add it to the session
- fix crash if save timeout for a client is triggered
- add a way to delete sessions
- drop usage of G_CONST_RETURN macro
- add Xft.xrdb, startxfce4, xinit, xfce.desktop and xflock4
files from xfce-utils
- explicitly link to libm where needed
- remove the xfce4-panel logout menu plugin
- don't try to remove the $HOME directory
- remove manual and link to docs.xfce.org
- Show dialog in settings category
- link to gmodule
- improve fadeout code with compositing enabled
- start screensaver with autostart
- support the TryExec key for autostart in the settings dialog
- rework the logout dialog code
- cleanup the power management code
- let xfce4-session handle the dbus-launch checking
- add support for launching xfce4-session in consolekit
- add --with-ck-launch support to startxfce4
- add option to lock the screen on suspend/hibernate
- remove unused icons
- show all applications in autostart
- drop gpg-agent and ssh-agent handling
- translation updates
- dropped xfce4-session-fix-gnome-mode.patch since upstream
provides an improved implementation
- dropped obsolete
xfce4-session-respect-session-save-setting.patch,
xfce4-session-lock-screen-on-suspend-hibernate.patch
- added xfce4-session-adapt-session-script.patch in order to adapt
the upstream sessions script to openSUSE
-------------------------------------------------------------------
Fri Mar 30 14:03:39 UTC 2012 - gber@opensuse.org

69
xfce4-session.spec
View File

@ -19,28 +19,22 @@
%define libname libxfsm-4_6-0
Name: xfce4-session
Version: 4.8.3
Version: 4.9.2
Release: 0
Summary: Xfce Session Manager
License: GPL-2.0
Group: System/GUI/XFCE
Url: http://docs.xfce.org/xfce/xfce4-session/start
Source: http://archive.xfce.org/src/xfce/xfce4-session/4.8/%{name}-%{version}.tar.bz2
Source0: http://archive.xfce.org/src/xfce/xfce4-session/4.9/%{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-fix-gnome-mode.patch bnc#710038 bxo#8014 gber@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 gber@opensuse.org -- Try to lock the screen when hibernating/suspending
Patch2: xfce4-session-lock-screen-on-suspend-hibernate.patch
# PATCH-FIX-UPSTREAM xfce4-session-respect-session-save-setting.patch bxo#7915 gber@opensuse.org -- Respect the value of the "/general/SaveOnExit" option from xfce4-session in the logout panel plugin as well (backported from upstream git)
Patch3: xfce4-session-respect-session-save-setting.patch
# PATCH-FIX-OPENSUSE xfce4-session-adapt-session-script.patch gber@opensuse.org -- Adapt upstream sessions script to openSUSE
Patch1: xfce4-session-adapt-session-script.patch
BuildRequires: intltool
BuildRequires: update-desktop-files
BuildRequires: xfce4-dev-tools
BuildRequires: xorg-x11
BuildRequires: pkgconfig(dbus-1)
BuildRequires: pkgconfig(dbus-glib-1)
BuildRequires: pkgconfig(gconf-2.0)
BuildRequires: pkgconfig(gmodule-2.0)
BuildRequires: pkgconfig(gnome-keyring-1)
BuildRequires: pkgconfig(gtk+-2.0)
@ -49,14 +43,26 @@ BuildRequires: pkgconfig(libxfce4panel-1.0)
BuildRequires: pkgconfig(libxfce4ui-1)
BuildRequires: pkgconfig(libxfce4util-1.0)
BuildRequires: pkgconfig(sm)
Provides: xfce-utils = %{version}
Obsoletes: xfce-utils <= 4.8.3
Provides: xfce-utils-doc = %{version}
Obsoletes: xfce-utils-doc <= 4.8.3
Provides: xfce-utils-lang = %{version}
Obsoletes: xfce-utils-lang <= 4.8.3
Provides: xfce4-session-doc = %{version}
Obsoletes: xfce4-session-doc <= 4.8.3
Requires: %{name}-branding = %{version}
Requires: xfce-utils
Requires: xfce4-settings
Requires: xfconf
Recommends: %{name}-doc = %{version}
Recommends: %{name}-lang = %{version}
# for xfce4-tips
Recommends: fortune
# minimal packages for an Xfce session
Recommends: xfwm4
Recommends: xfdesktop
Recommends: thunar
Recommends: xfce4-panel
# xfce4-about needs to be dragged at a low level
Recommends: libxfce4ui-tools
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -79,14 +85,6 @@ Requires: %{libname} = %{version}
This package contains development files needed to develop custom splash screen
engines for the xfce4-session.
%package doc
Summary: Documentation for xfce4-session
Group: Documentation/HTML
BuildArch: noarch
%description doc
This package includes the documentation for xfce4-session.
%package branding-upstream
Summary: Upstream Branding of xfce4-session
Group: System/GUI/XFCE
@ -95,8 +93,6 @@ Provides: %{name}-branding = %{version}
Conflicts: otherproviders(%{name}-branding)
# BRAND: xfce4-session.xml: Control session parameters such as the tools and
# BRAND: applications started by default or the splash theme.
# BRAND: xfce4-tips-autostart.desktop: Control whether xfce4-tips is started
# BRAND: by default.
BuildArch: noarch
%description branding-upstream
@ -108,13 +104,9 @@ This package provides the upstream look and feel for the Xfce Session Manager.
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%build
xdt-autogen
%configure \
--docdir=%{_datadir}/xfce4/xfce4-session \
--disable-static \
--enable-session-screenshots \
--enable-gnome \
@ -124,9 +116,11 @@ make %{?_smp_mflags} V=1
%install
%make_install
%suse_update_desktop_file xfce-session-settings
chmod 755 %{buildroot}%{_sysconfdir}/xdg/xfce4/xinitrc
# add back X-XFCE for now; this is a personal and not a system setting
%suse_update_desktop_file -r xfce-session-settings XFCE X-XFCE GTK Settings DesktopSettings X-XFCE-SettingsDialog X-XFCE-PersonalSettings
%suse_update_desktop_file xfce4-session-logout
%suse_update_desktop_file xfce4-tips-autostart
rm -rf %{buildroot}%{_datadir}/locale/{ast,kk,tl_PH,ur_PK}
@ -152,16 +146,20 @@ rm -rf %{buildroot}
%files
%defattr(-,root,root)
%doc AUTHORS BUGS COPYING ChangeLog NEWS README TODO
%dir %{_sysconfdir}/xdg/xfce4
%config %{_sysconfdir}/xdg/xfce4/Xft.xrdb
%{_sysconfdir}/xdg/xfce4/xinitrc
%{_sysconfdir}/xdg/autostart/xscreensaver.desktop
%{_bindir}/xfce4-session
%{_bindir}/xfce4-session-logout
%{_bindir}/xfce4-session-settings
%{_bindir}/xfce4-tips
%{_bindir}/xflock4
%{_bindir}/startxfce4
%{_libdir}/xfce4
%{_datadir}/xsessions/xfce.desktop
%{_datadir}/themes/*
%{_datadir}/applications/*.desktop
%{_datadir}/icons/*/*/*
%{_datadir}/xfce4/panel-plugins/xfsm-logout-plugin.desktop
%{_datadir}/xfce4/tips/
%doc %{_mandir}/man1/xfce4-session*.1*
%files -n %{libname}
@ -169,12 +167,6 @@ rm -rf %{buildroot}
%doc COPYING
%{_libdir}/libxfsm-*.so.*
%files doc
%defattr(-,root,root)
%dir %{_datadir}/xfce4
%dir %{_datadir}/xfce4/xfce4-session
%doc %{_datadir}/xfce4/xfce4-session/html/
%files lang -f %{name}.lang
%files devel
@ -190,6 +182,5 @@ rm -rf %{buildroot}
%dir %{_sysconfdir}/xdg/xfce4/xfconf
%dir %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml
%config %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
%config %{_sysconfdir}/xdg/autostart/xfce4-tips-autostart.desktop
%changelog