From 9c56cdfd8c7343a2308f39ced6810e32319f8b736a13c856484a661e6340966b Mon Sep 17 00:00:00 2001 From: andrea florio Date: Tue, 10 Sep 2013 10:42:51 +0000 Subject: [PATCH] Accepting request 197987 from home:MargueriteSu:branches:X11:lxde update version 0.4.9.2 OBS-URL: https://build.opensuse.org/request/show/197987 OBS-URL: https://build.opensuse.org/package/show/X11:lxde/lxsession?expand=0&rev=54 --- ...0.4.6.1-support-reboot-shutdown-ltst.patch | 28 -- ...ion-0.4.6.1-support-user-switch-gdm3.patch | 30 -- lxsession-0.4.6.1.tar.bz2 | 3 - lxsession-0.4.9.2-gtk3-fix.patch | 338 ++++++++++++++++++ lxsession-0.4.9.2.tar.gz | 3 + lxsession.changes | 13 + lxsession.spec | 86 +++-- 7 files changed, 410 insertions(+), 91 deletions(-) delete mode 100644 lxsession-0.4.6.1-support-reboot-shutdown-ltst.patch delete mode 100644 lxsession-0.4.6.1-support-user-switch-gdm3.patch delete mode 100644 lxsession-0.4.6.1.tar.bz2 create mode 100644 lxsession-0.4.9.2-gtk3-fix.patch create mode 100644 lxsession-0.4.9.2.tar.gz diff --git a/lxsession-0.4.6.1-support-reboot-shutdown-ltst.patch b/lxsession-0.4.6.1-support-reboot-shutdown-ltst.patch deleted file mode 100644 index 58e2cd2..0000000 --- a/lxsession-0.4.6.1-support-reboot-shutdown-ltst.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 466982ce65e6d673c54ba7a0546d463da1fe5bfa Mon Sep 17 00:00:00 2001 -From: =?utf8?q?Andrew=20Lee=20(=E6=9D=8E=E5=81=A5=E7=A7=8B)?= -Date: Fri, 29 Jul 2011 21:11:06 +0800 -Subject: [PATCH] Support reboot and shutdown in LTST client. Thanks Vagrant Cascadian . - ---- - lxsession-logout/lxsession-logout.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/lxsession-logout/lxsession-logout.c b/lxsession-logout/lxsession-logout.c -index a1c26f4..5bb8add 100644 ---- a/lxsession-logout/lxsession-logout.c -+++ b/lxsession-logout/lxsession-logout.c -@@ -458,7 +458,11 @@ int main(int argc, char * argv[]) - - /* LTSP support */ - if (g_getenv("LTSP_CLIENT")) -+ { - handler_context.ltsp = TRUE; -+ handler_context.shutdown_available = TRUE; -+ handler_context.reboot_available = TRUE; -+ } - - /* Make the button images accessible. */ - gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(), PACKAGE_DATA_DIR "/lxsession/images"); --- -1.7.0.1 - diff --git a/lxsession-0.4.6.1-support-user-switch-gdm3.patch b/lxsession-0.4.6.1-support-user-switch-gdm3.patch deleted file mode 100644 index a74aa9c..0000000 --- a/lxsession-0.4.6.1-support-user-switch-gdm3.patch +++ /dev/null @@ -1,30 +0,0 @@ -From a872047b9b04707adb5e26b6e14cc7a1d740421f Mon Sep 17 00:00:00 2001 -From: =?utf8?q?Andrew=20Lee=20(=E6=9D=8E=E5=81=A5=E7=A7=8B)?= -Date: Fri, 29 Jul 2011 21:09:33 +0800 -Subject: [PATCH] Support user switch with gdm3 in lxsession-logout. - ---- - lxsession-logout/lxsession-logout.c | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) - -diff --git a/lxsession-logout/lxsession-logout.c b/lxsession-logout/lxsession-logout.c -index 86f906a..a1c26f4 100644 ---- a/lxsession-logout/lxsession-logout.c -+++ b/lxsession-logout/lxsession-logout.c -@@ -442,6 +442,13 @@ int main(int argc, char * argv[]) - handler_context.switch_user_GDM = TRUE; - } - -+ /* If we are under GDM3, its "Switch User" is available. */ -+ if (verify_running("gdm3", "gdmflexiserver")) -+ { -+ handler_context.switch_user_available = TRUE; -+ handler_context.switch_user_GDM = TRUE; -+ } -+ - /* If we are under KDM, its "Switch User" is available. */ - if (verify_running("kdm", "kdmctl")) - { --- -1.7.0.1 - diff --git a/lxsession-0.4.6.1.tar.bz2 b/lxsession-0.4.6.1.tar.bz2 deleted file mode 100644 index cdb32fa..0000000 --- a/lxsession-0.4.6.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:83be724bb3ae078caf138afbcb870361b9d643737f6b9e9dad10f36a000c54db -size 310754 diff --git a/lxsession-0.4.9.2-gtk3-fix.patch b/lxsession-0.4.9.2-gtk3-fix.patch new file mode 100644 index 0000000..b91ba43 --- /dev/null +++ b/lxsession-0.4.9.2-gtk3-fix.patch @@ -0,0 +1,338 @@ +Index: lxsession-0.4.9.2/lxsession-default-apps/combobox.c +=================================================================== +--- lxsession-0.4.9.2.orig/lxsession-default-apps/combobox.c ++++ lxsession-0.4.9.2/lxsession-default-apps/combobox.c +@@ -123,7 +123,7 @@ static void __lambda5_ (Block4Data* _dat + } else { + GtkEntry* _tmp17_; + _tmp17_ = entry; +- gtk_widget_hide_all ((GtkWidget*) _tmp17_); ++ gtk_widget_hide ((GtkWidget*) _tmp17_); + } + _g_object_unref0 (entry); + } +@@ -375,7 +375,7 @@ GtkComboBox* ldefault_apps_ui_combobox_i + _tmp65_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp64_, GTK_TYPE_ENTRY) ? ((GtkEntry*) _tmp64_) : NULL); + entry_default = _tmp65_; + _tmp66_ = entry_default; +- gtk_widget_hide_all ((GtkWidget*) _tmp66_); ++ gtk_widget_hide ((GtkWidget*) _tmp66_); + _g_object_unref0 (entry_default); + } + } +Index: lxsession-0.4.9.2/lxsession-default-apps/main.c +=================================================================== +--- lxsession-0.4.9.2.orig/lxsession-default-apps/main.c ++++ lxsession-0.4.9.2/lxsession-default-apps/main.c +@@ -143,7 +143,7 @@ gint ldefault_apps_main (gchar** args, i + GType ldefault_apps_dbus_backend_get_type (void) G_GNUC_CONST; + static Block3Data* block3_data_ref (Block3Data* _data3_); + static void block3_data_unref (void * _userdata_); +-static void _gtk_main_quit_gtk_object_destroy (GtkObject* _sender, gpointer self); ++static void _gtk_main_quit_gtk_object_destroy (GObject* _sender, gpointer self); + void ldefault_apps_manual_autostart_init (GtkBuilder* builder); + LDefaultAppsDbusBackend* ldefault_apps_dbus_backend_new (void); + LDefaultAppsDbusBackend* ldefault_apps_dbus_backend_construct (GType object_type); +@@ -515,7 +515,7 @@ static gpointer _g_object_ref0 (gpointer + } + + +-static void _gtk_main_quit_gtk_object_destroy (GtkObject* _sender, gpointer self) { ++static void _gtk_main_quit_gtk_object_destroy (GObject* _sender, gpointer self) { + gtk_main_quit (); + } + +@@ -2056,9 +2056,9 @@ static void __lambda59_ (Block3Data* _da + GtkVBox* _tmp14_; + GtkVBox* _tmp15_; + _tmp14_ = auto_vbox; +- gtk_widget_hide_all ((GtkWidget*) _tmp14_); ++ gtk_widget_hide ((GtkWidget*) _tmp14_); + _tmp15_ = running_apps; +- gtk_widget_hide_all ((GtkWidget*) _tmp15_); ++ gtk_widget_hide ((GtkWidget*) _tmp15_); + } else { + GtkVBox* _tmp16_; + GtkVBox* _tmp17_; +@@ -3551,7 +3551,7 @@ gint ldefault_apps_main (gchar** args, i + _tmp35_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp34_, GTK_TYPE_WINDOW) ? ((GtkWindow*) _tmp34_) : NULL); + window = _tmp35_; + _tmp36_ = window; +- g_signal_connect ((GtkObject*) _tmp36_, "destroy", (GCallback) _gtk_main_quit_gtk_object_destroy, NULL); ++ g_signal_connect ((GObject*) _tmp36_, "destroy", (GCallback) _gtk_main_quit_gtk_object_destroy, NULL); + _tmp37_ = _data3_->builder; + ldefault_apps_manual_autostart_init (_tmp37_); + _tmp38_ = ldefault_apps_dbus_backend_new (); +@@ -5088,238 +5088,238 @@ gint ldefault_apps_main (gchar** args, i + if (_tmp878_ != 99) { + GtkEntry* _tmp879_; + _tmp879_ = _data3_->panel_command_entry; +- gtk_widget_hide_all ((GtkWidget*) _tmp879_); ++ gtk_widget_hide ((GtkWidget*) _tmp879_); + } + _tmp880_ = _data3_->panel_session_combobox; + _tmp881_ = ldefault_apps_return_combobox_position (_tmp880_); + if (_tmp881_ != 99) { + GtkEntry* _tmp882_; + _tmp882_ = _data3_->panel_session_entry; +- gtk_widget_hide_all ((GtkWidget*) _tmp882_); ++ gtk_widget_hide ((GtkWidget*) _tmp882_); + } + _tmp883_ = _data3_->dock_command_combobox; + _tmp884_ = ldefault_apps_return_combobox_position (_tmp883_); + if (_tmp884_ != 99) { + GtkEntry* _tmp885_; + _tmp885_ = _data3_->dock_command_entry; +- gtk_widget_hide_all ((GtkWidget*) _tmp885_); ++ gtk_widget_hide ((GtkWidget*) _tmp885_); + } + _tmp886_ = _data3_->dock_session_combobox; + _tmp887_ = ldefault_apps_return_combobox_position (_tmp886_); + if (_tmp887_ != 99) { + GtkEntry* _tmp888_; + _tmp888_ = _data3_->dock_session_entry; +- gtk_widget_hide_all ((GtkWidget*) _tmp888_); ++ gtk_widget_hide ((GtkWidget*) _tmp888_); + } + _tmp889_ = _data3_->window_command_combobox; + _tmp890_ = ldefault_apps_return_combobox_position (_tmp889_); + if (_tmp890_ != 99) { + GtkEntry* _tmp891_; + _tmp891_ = _data3_->window_command_entry; +- gtk_widget_hide_all ((GtkWidget*) _tmp891_); ++ gtk_widget_hide ((GtkWidget*) _tmp891_); + } + _tmp892_ = _data3_->window_session_combobox; + _tmp893_ = ldefault_apps_return_combobox_position (_tmp892_); + if (_tmp893_ != 99) { + GtkEntry* _tmp894_; + _tmp894_ = _data3_->window_session_entry; +- gtk_widget_hide_all ((GtkWidget*) _tmp894_); ++ gtk_widget_hide ((GtkWidget*) _tmp894_); + } + _tmp895_ = _data3_->window_extras_combobox; + _tmp896_ = ldefault_apps_return_combobox_position (_tmp895_); + if (_tmp896_ != 99) { + GtkEntry* _tmp897_; + _tmp897_ = _data3_->window_extras_entry; +- gtk_widget_hide_all ((GtkWidget*) _tmp897_); ++ gtk_widget_hide ((GtkWidget*) _tmp897_); + } + _tmp898_ = _data3_->screensaver_command_combobox; + _tmp899_ = ldefault_apps_return_combobox_position (_tmp898_); + if (_tmp899_ != 99) { + GtkEntry* _tmp900_; + _tmp900_ = _data3_->screensaver_command_entry; +- gtk_widget_hide_all ((GtkWidget*) _tmp900_); ++ gtk_widget_hide ((GtkWidget*) _tmp900_); + } + _tmp901_ = _data3_->power_command_combobox; + _tmp902_ = ldefault_apps_return_combobox_position (_tmp901_); + if (_tmp902_ != 99) { + GtkEntry* _tmp903_; + _tmp903_ = _data3_->power_command_entry; +- gtk_widget_hide_all ((GtkWidget*) _tmp903_); ++ gtk_widget_hide ((GtkWidget*) _tmp903_); + } + _tmp904_ = _data3_->file_command_combobox; + _tmp905_ = ldefault_apps_return_combobox_position (_tmp904_); + if (_tmp905_ != 99) { + GtkEntry* _tmp906_; + _tmp906_ = _data3_->file_command_entry; +- gtk_widget_hide_all ((GtkWidget*) _tmp906_); ++ gtk_widget_hide ((GtkWidget*) _tmp906_); + } + _tmp907_ = _data3_->file_session_combobox; + _tmp908_ = ldefault_apps_return_combobox_position (_tmp907_); + if (_tmp908_ != 99) { + GtkEntry* _tmp909_; + _tmp909_ = _data3_->file_session_entry; +- gtk_widget_hide_all ((GtkWidget*) _tmp909_); ++ gtk_widget_hide ((GtkWidget*) _tmp909_); + } + _tmp910_ = _data3_->file_extras_combobox; + _tmp911_ = ldefault_apps_return_combobox_position (_tmp910_); + if (_tmp911_ != 99) { + GtkEntry* _tmp912_; + _tmp912_ = _data3_->file_extras_entry; +- gtk_widget_hide_all ((GtkWidget*) _tmp912_); ++ gtk_widget_hide ((GtkWidget*) _tmp912_); + } + _tmp913_ = _data3_->desktop_command_combobox; + _tmp914_ = ldefault_apps_return_combobox_position (_tmp913_); + if (_tmp914_ != 99) { + GtkEntry* _tmp915_; + _tmp915_ = _data3_->desktop_command_entry; +- gtk_widget_hide_all ((GtkWidget*) _tmp915_); ++ gtk_widget_hide ((GtkWidget*) _tmp915_); + } + _tmp916_ = _data3_->desktop_wallpaper_combobox; + _tmp917_ = ldefault_apps_return_combobox_position (_tmp916_); + if (_tmp917_ != 99) { + GtkEntry* _tmp918_; + _tmp918_ = _data3_->desktop_wallpaper_entry; +- gtk_widget_hide_all ((GtkWidget*) _tmp918_); ++ gtk_widget_hide ((GtkWidget*) _tmp918_); + } + _tmp919_ = _data3_->composite_command_combobox; + _tmp920_ = ldefault_apps_return_combobox_position (_tmp919_); + if (_tmp920_ != 99) { + GtkEntry* _tmp921_; + _tmp921_ = _data3_->composite_command_entry; +- gtk_widget_hide_all ((GtkWidget*) _tmp921_); ++ gtk_widget_hide ((GtkWidget*) _tmp921_); + } + _tmp922_ = _data3_->composite_autostart_combobox; + _tmp923_ = ldefault_apps_return_combobox_position (_tmp922_); + if (_tmp923_ != 99) { + GtkEntry* _tmp924_; + _tmp924_ = _data3_->composite_autostart_entry; +- gtk_widget_hide_all ((GtkWidget*) _tmp924_); ++ gtk_widget_hide ((GtkWidget*) _tmp924_); + } + _tmp925_ = _data3_->im1_command_combobox; + _tmp926_ = ldefault_apps_return_combobox_position (_tmp925_); + if (_tmp926_ != 99) { + GtkEntry* _tmp927_; + _tmp927_ = _data3_->im1_command_entry; +- gtk_widget_hide_all ((GtkWidget*) _tmp927_); ++ gtk_widget_hide ((GtkWidget*) _tmp927_); + } + _tmp928_ = _data3_->im1_autostart_combobox; + _tmp929_ = ldefault_apps_return_combobox_position (_tmp928_); + if (_tmp929_ != 99) { + GtkEntry* _tmp930_; + _tmp930_ = _data3_->im1_autostart_entry; +- gtk_widget_hide_all ((GtkWidget*) _tmp930_); ++ gtk_widget_hide ((GtkWidget*) _tmp930_); + } + _tmp931_ = _data3_->im2_command_combobox; + _tmp932_ = ldefault_apps_return_combobox_position (_tmp931_); + if (_tmp932_ != 99) { + GtkEntry* _tmp933_; + _tmp933_ = _data3_->im2_command_entry; +- gtk_widget_hide_all ((GtkWidget*) _tmp933_); ++ gtk_widget_hide ((GtkWidget*) _tmp933_); + } + _tmp934_ = _data3_->im2_autostart_combobox; + _tmp935_ = ldefault_apps_return_combobox_position (_tmp934_); + if (_tmp935_ != 99) { + GtkEntry* _tmp936_; + _tmp936_ = _data3_->im2_autostart_entry; +- gtk_widget_hide_all ((GtkWidget*) _tmp936_); ++ gtk_widget_hide ((GtkWidget*) _tmp936_); + } + _tmp937_ = _data3_->widget1_command_combobox; + _tmp938_ = ldefault_apps_return_combobox_position (_tmp937_); + if (_tmp938_ != 99) { + GtkEntry* _tmp939_; + _tmp939_ = _data3_->widget1_command_entry; +- gtk_widget_hide_all ((GtkWidget*) _tmp939_); ++ gtk_widget_hide ((GtkWidget*) _tmp939_); + } + _tmp940_ = _data3_->widget1_autostart_combobox; + _tmp941_ = ldefault_apps_return_combobox_position (_tmp940_); + if (_tmp941_ != 99) { + GtkEntry* _tmp942_; + _tmp942_ = _data3_->widget1_autostart_entry; +- gtk_widget_hide_all ((GtkWidget*) _tmp942_); ++ gtk_widget_hide ((GtkWidget*) _tmp942_); + } + _tmp943_ = _data3_->polkit_command_combobox; + _tmp944_ = ldefault_apps_return_combobox_position (_tmp943_); + if (_tmp944_ != 99) { + GtkEntry* _tmp945_; + _tmp945_ = _data3_->polkit_command_entry; +- gtk_widget_hide_all ((GtkWidget*) _tmp945_); ++ gtk_widget_hide ((GtkWidget*) _tmp945_); + } + _tmp946_ = _data3_->network_command_combobox; + _tmp947_ = ldefault_apps_return_combobox_position (_tmp946_); + if (_tmp947_ != 99) { + GtkEntry* _tmp948_; + _tmp948_ = _data3_->network_command_entry; +- gtk_widget_hide_all ((GtkWidget*) _tmp948_); ++ gtk_widget_hide ((GtkWidget*) _tmp948_); + } + _tmp949_ = _data3_->audio_command_combobox; + _tmp950_ = ldefault_apps_return_combobox_position (_tmp949_); + if (_tmp950_ != 99) { + GtkEntry* _tmp951_; + _tmp951_ = _data3_->audio_command_entry; +- gtk_widget_hide_all ((GtkWidget*) _tmp951_); ++ gtk_widget_hide ((GtkWidget*) _tmp951_); + } + _tmp952_ = _data3_->quit_command_combobox; + _tmp953_ = ldefault_apps_return_combobox_position (_tmp952_); + if (_tmp953_ != 99) { + GtkEntry* _tmp954_; + _tmp954_ = _data3_->quit_command_entry; +- gtk_widget_hide_all ((GtkWidget*) _tmp954_); ++ gtk_widget_hide ((GtkWidget*) _tmp954_); + } + _tmp955_ = _data3_->quit_image_combobox; + _tmp956_ = ldefault_apps_return_combobox_position (_tmp955_); + if (_tmp956_ != 99) { + GtkEntry* _tmp957_; + _tmp957_ = _data3_->quit_image_entry; +- gtk_widget_hide_all ((GtkWidget*) _tmp957_); ++ gtk_widget_hide ((GtkWidget*) _tmp957_); + } + _tmp958_ = _data3_->quit_layout_combobox; + _tmp959_ = ldefault_apps_return_combobox_position (_tmp958_); + if (_tmp959_ != 99) { + GtkEntry* _tmp960_; + _tmp960_ = _data3_->quit_layout_entry; +- gtk_widget_hide_all ((GtkWidget*) _tmp960_); ++ gtk_widget_hide ((GtkWidget*) _tmp960_); + } + _tmp961_ = _data3_->workspace_command_combobox; + _tmp962_ = ldefault_apps_return_combobox_position (_tmp961_); + if (_tmp962_ != 99) { + GtkEntry* _tmp963_; + _tmp963_ = _data3_->workspace_command_entry; +- gtk_widget_hide_all ((GtkWidget*) _tmp963_); ++ gtk_widget_hide ((GtkWidget*) _tmp963_); + } + _tmp964_ = _data3_->launcher_command_combobox; + _tmp965_ = ldefault_apps_return_combobox_position (_tmp964_); + if (_tmp965_ != 99) { + GtkEntry* _tmp966_; + _tmp966_ = _data3_->launcher_command_entry; +- gtk_widget_hide_all ((GtkWidget*) _tmp966_); ++ gtk_widget_hide ((GtkWidget*) _tmp966_); + } + _tmp967_ = _data3_->terminal_command_combobox; + _tmp968_ = ldefault_apps_return_combobox_position (_tmp967_); + if (_tmp968_ != 99) { + GtkEntry* _tmp969_; + _tmp969_ = _data3_->terminal_command_entry; +- gtk_widget_hide_all ((GtkWidget*) _tmp969_); ++ gtk_widget_hide ((GtkWidget*) _tmp969_); + } + _tmp970_ = _data3_->screenshot_command_combobox; + _tmp971_ = ldefault_apps_return_combobox_position (_tmp970_); + if (_tmp971_ != 99) { + GtkEntry* _tmp972_; + _tmp972_ = _data3_->screenshot_command_entry; +- gtk_widget_hide_all ((GtkWidget*) _tmp972_); ++ gtk_widget_hide ((GtkWidget*) _tmp972_); + } + _tmp973_ = _data3_->upgrade_command_combobox; + _tmp974_ = ldefault_apps_return_combobox_position (_tmp973_); + if (_tmp974_ != 99) { + GtkEntry* _tmp975_; + _tmp975_ = _data3_->upgrade_command_entry; +- gtk_widget_hide_all ((GtkWidget*) _tmp975_); ++ gtk_widget_hide ((GtkWidget*) _tmp975_); + } + _tmp976_ = _data3_->clipboard_command_combobox; + _tmp977_ = ldefault_apps_return_combobox_position (_tmp976_); + if (_tmp977_ != 99) { + GtkEntry* _tmp978_; + _tmp978_ = _data3_->clipboard_command_entry; +- gtk_widget_hide_all ((GtkWidget*) _tmp978_); ++ gtk_widget_hide ((GtkWidget*) _tmp978_); + } + gtk_main (); + _tmp979_ = g_main_loop_new (NULL, FALSE); diff --git a/lxsession-0.4.9.2.tar.gz b/lxsession-0.4.9.2.tar.gz new file mode 100644 index 0000000..ab9e693 --- /dev/null +++ b/lxsession-0.4.9.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eff03e573b561cabe81c5d015d825e3d998e98d6621040113d7df471c8b9cfb4 +size 745637 diff --git a/lxsession.changes b/lxsession.changes index e524f73..51440c2 100644 --- a/lxsession.changes +++ b/lxsession.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Wed Sep 4 14:17:34 UTC 2013 - i@marguerite.su + +- update version 0.4.9.2 + * bugfix release +- removed all 0.4.6.1 patches, upstreamed + * lxsession-0.4.6.1-support-reboot-shutdown-ltst.patch + * lxsession-0.4.6.1-support-user-switch-gdm3.patch +- build with gtk3 on 12.3+ machines +- add patch: lxsession-0.4.9.2-gtk3-fix.patch + * gtkobject is no more in gtk3, fix with gobject. + * gtk_widget_hide_all is no more, fix with gtk_widget_hide + ------------------------------------------------------------------- Fri Jul 29 22:35:40 UTC 2011 - andrea@opensuse.org diff --git a/lxsession.spec b/lxsession.spec index a971be2..96e27f5 100644 --- a/lxsession.spec +++ b/lxsession.spec @@ -1,7 +1,7 @@ # # spec file for package lxsession # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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,59 +15,85 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: lxsession -Version: 0.4.6.1 -Release: 1 +Version: 0.4.9.2 +Release: 0 Summary: LXDE Session Manager, required for running the desktop environment +License: GPL-2.0 Group: System/GUI/LXDE -License: GPLv2 Url: http://www.lxde.org/ -Source0: %{name}-%{version}.tar.bz2 -Patch0: %name-0.4.6.1-support-user-switch-gdm3.patch -Patch1: %name-0.4.6.1-support-reboot-shutdown-ltst.patch +Source: %{name}-%{version}.tar.gz +# PATCH-FIX-UPSTREAM marguerite@opensuse.org -gtkobject is no more in gtk3, replace with gobject +Patch: lxsession-0.4.9.2-gtk3-fix.patch +BuildRequires: dbus-1-glib-devel +BuildRequires: docbook-utils +BuildRequires: docbook-xsl-stylesheets +BuildRequires: fdupes +%if 0%{?suse_version} <= 1220 +BuildRequires: gtk2-devel +%else +BuildRequires: gtk3-devel +%endif +BuildRequires: intltool +BuildRequires: libxslt +%if 0%{?suse_version} <= 1230 +BuildRequires: libgee-devel +%else +BuildRequires: libgee06-devel +%endif +BuildRequires: pkg-config +BuildRequires: polkit-devel +BuildRequires: vala >= 0.14 BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: dbus-1-glib-devel fdupes gtk2-devel intltool pkg-config -BuildRequires: docbook-utils docbook-xsl-stylesheets libxslt %description LXSession is the standard session manager used by LXDE. The LXSession manager is used to automatically start a set of applications and set up a working desktop environment. Moreover, the session manager is able to remember the applications in -use when a user logs out and to restart them the next time the user logs in. - -Authors: --------- - Hong Jen Yee (aka PCMan) +use when a user logs out and to restart them the next time the user logs in. %prep -%setup -q -n %name-%version -%patch0 -p1 -%patch1 -p1 +%setup -q +%if 0%{?suse_version} > 1220 +%patch -p1 +%endif %build -%configure --enable-man -%__make %{?jobs:-j%jobs} V=1 +%configure \ +%if 0%{?suse_version} > 1220 + --enable-gtk3 \ +%endif + --enable-man +make %{?_smp_mflags} V=1 %install -%makeinstall +%make_install %find_lang %{name} -%fdupes -s %buildroot -%clean -rm -rf $RPM_BUILD_ROOT +# fix icon problems +# no such icon lxsession-default-apps +sed -i "3d" %{buildroot}%{_datadir}/applications/lxsession-default-apps.desktop +# why lxde use xfwm4 icon ? +sed -i "3d" %{buildroot}%{_datadir}/applications/lxsession-edit.desktop + +%fdupes %{buildroot} %files -f %{name}.lang %defattr(-,root,root,0755) -%doc ChangeLog README COPYING +%doc AUTHORS ChangeLog README COPYING TODO %{_bindir}/lxlock %{_bindir}/lxsession %{_bindir}/lxsession-logout -%dir %{_datadir}/lxsession -%dir %{_datadir}/lxsession/images -%{_datadir}/lxsession/images/*.png -%_mandir/man1/*.1.gz +%{_bindir}/lxclipboard +%{_bindir}/lxpolkit +%{_bindir}/lxsession-default +%{_bindir}/lxsession-default-apps +%{_bindir}/lxsession-default-terminal +%{_bindir}/lxsession-edit +%{_datadir}/lxsession/ +%{_datadir}/applications/lxsession-default-apps.desktop +%{_datadir}/applications/lxsession-edit.desktop +%{_mandir}/man1/*.1.gz %changelog