diff --git a/lxsession-0.4.2-implicit-fortify-decl.patch b/lxsession-0.4.2-implicit-fortify-decl.patch deleted file mode 100644 index f7c5525..0000000 --- a/lxsession-0.4.2-implicit-fortify-decl.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -uNr old-lxsession-0.4.2//lxsession-logout/dbus-interface.c lxsession-0.4.2/lxsession-logout/dbus-interface.c ---- old-lxsession-0.4.2//lxsession-logout/dbus-interface.c 2010-02-22 13:08:17.000000000 +0100 -+++ lxsession-0.4.2/lxsession-logout/dbus-interface.c 2010-03-08 12:25:31.314311904 +0100 -@@ -18,6 +18,7 @@ - - #include - #include -+#include - #ifdef HAVE_DBUS - #include - #endif -diff -uNr old-lxsession-0.4.2//lxsession-logout/lxsession-logout.c lxsession-0.4.2/lxsession-logout/lxsession-logout.c ---- old-lxsession-0.4.2//lxsession-logout/lxsession-logout.c 2010-02-21 19:19:21.000000000 +0100 -+++ lxsession-0.4.2/lxsession-logout/lxsession-logout.c 2010-03-08 12:28:24.899311986 +0100 -@@ -17,6 +17,7 @@ - */ - - #include -+#include - #include - #include - #include diff --git a/lxsession-0.4.2.tar.bz2 b/lxsession-0.4.2.tar.bz2 deleted file mode 100644 index 13948d3..0000000 --- a/lxsession-0.4.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b462f96abb91b9b8eaa44f184f8270325b9538bdbb554a4d2fbcbe76b68ff9d7 -size 203368 diff --git a/lxsession-0.4.2-fix-buttons-position.patch b/lxsession-0.4.3-fix-buttons-position.patch similarity index 71% rename from lxsession-0.4.2-fix-buttons-position.patch rename to lxsession-0.4.3-fix-buttons-position.patch index d0a67f8..c4c2cc1 100644 --- a/lxsession-0.4.2-fix-buttons-position.patch +++ b/lxsession-0.4.3-fix-buttons-position.patch @@ -1,7 +1,58 @@ -diff -uNr old-lxsession-0.4.2//lxsession-logout/lxsession-logout.c lxsession-0.4.2/lxsession-logout/lxsession-logout.c ---- old-lxsession-0.4.2//lxsession-logout/lxsession-logout.c 2010-03-10 07:41:10.972412403 +0100 -+++ lxsession-0.4.2/lxsession-logout/lxsession-logout.c 2010-03-10 07:45:45.528412788 +0100 -@@ -405,6 +405,8 @@ +diff -uNr old-lxsession-0.4.3/lxsession-logout/lxsession-logout.c lxsession-0.4.3//lxsession-logout/lxsession-logout.c +--- old-lxsession-0.4.3/lxsession-logout/lxsession-logout.c 2010-03-18 17:21:34.000000000 +0100 ++++ lxsession-0.4.3//lxsession-logout/lxsession-logout.c 2010-03-18 22:41:18.875553519 +0100 +@@ -395,6 +395,8 @@ + GtkWidget * shutdown_button = gtk_button_new_with_mnemonic(_("Sh_utdown")); + GtkWidget * image = gtk_image_new_from_icon_name("system-shutdown", GTK_ICON_SIZE_BUTTON); + gtk_button_set_image(GTK_BUTTON(shutdown_button), image); ++ /* align it to left 0.0 as X and 0.0 as Y */ ++ gtk_button_set_alignment(GTK_BUTTON(shutdown_button), 0.0 ,0.0); + g_signal_connect(G_OBJECT(shutdown_button), "clicked", G_CALLBACK(shutdown_clicked), &handler_context); + gtk_box_pack_start(GTK_BOX(controls), shutdown_button, FALSE, FALSE, 4); + } +@@ -404,8 +406,10 @@ + { + GtkWidget * reboot_button = gtk_button_new_with_mnemonic(_("_Reboot")); + GtkWidget * image = gtk_image_new_from_icon_name("gnome-session-reboot", GTK_ICON_SIZE_BUTTON); +- gtk_button_set_image(GTK_BUTTON(reboot_button), image); +- g_signal_connect(G_OBJECT(reboot_button), "clicked", G_CALLBACK(reboot_clicked), &handler_context); ++ gtk_button_set_image(GTK_BUTTON(reboot_button), image); ++ /* align it to left 0.0 as X and 0.0 as Y */ ++ gtk_button_set_alignment(GTK_BUTTON(reboot_button), 0.0 ,0.0); ++ g_signal_connect(G_OBJECT(reboot_button), "clicked", G_CALLBACK(reboot_clicked), &handler_context); + gtk_box_pack_start(GTK_BOX(controls), reboot_button, FALSE, FALSE, 4); + } + +@@ -415,7 +419,9 @@ + GtkWidget * suspend_button = gtk_button_new_with_mnemonic(_("_Suspend")); + GtkWidget * image = gtk_image_new_from_icon_name("gnome-session-suspend", GTK_ICON_SIZE_BUTTON); + gtk_button_set_image(GTK_BUTTON(suspend_button), image); +- g_signal_connect(G_OBJECT(suspend_button), "clicked", G_CALLBACK(suspend_clicked), &handler_context); ++ /* align it to left 0.0 as X and 0.0 as Y */ ++ gtk_button_set_alignment(GTK_BUTTON(suspend_button), 0.0 ,0.0); ++ g_signal_connect(G_OBJECT(suspend_button), "clicked", G_CALLBACK(suspend_clicked), &handler_context); + gtk_box_pack_start(GTK_BOX(controls), suspend_button, FALSE, FALSE, 4); + } + +@@ -425,6 +431,8 @@ + GtkWidget * hibernate_button = gtk_button_new_with_mnemonic(_("_Hibernate")); + GtkWidget * image = gtk_image_new_from_icon_name("gnome-session-hibernate", GTK_ICON_SIZE_BUTTON); + gtk_button_set_image(GTK_BUTTON(hibernate_button), image); ++ /* align it to left 0.0 as X and 0.0 as Y */ ++ gtk_button_set_alignment(GTK_BUTTON(hibernate_button), 0.0 ,0.0); + g_signal_connect(G_OBJECT(hibernate_button), "clicked", G_CALLBACK(hibernate_clicked), &handler_context); + gtk_box_pack_start(GTK_BOX(controls), hibernate_button, FALSE, FALSE, 4); + } +@@ -435,6 +443,8 @@ + GtkWidget * switch_user_button = gtk_button_new_with_mnemonic(_("S_witch User")); + GtkWidget * image = gtk_image_new_from_icon_name("gnome-session-switch", GTK_ICON_SIZE_BUTTON); + gtk_button_set_image(GTK_BUTTON(switch_user_button), image); ++ /* align it to left 0.0 as X and 0.0 as Y */ ++ gtk_button_set_alignment(GTK_BUTTON(switch_user_button), 0.0 ,0.0); + g_signal_connect(G_OBJECT(switch_user_button), "clicked", G_CALLBACK(switch_user_clicked), &handler_context); + gtk_box_pack_start(GTK_BOX(controls), switch_user_button, FALSE, FALSE, 4); + } +@@ -443,11 +453,15 @@ GtkWidget * logout_button = gtk_button_new_with_mnemonic(_("_Logout")); GtkWidget * image = gtk_image_new_from_icon_name("system-log-out", GTK_ICON_SIZE_BUTTON); gtk_button_set_image(GTK_BUTTON(logout_button), image); @@ -10,52 +61,6 @@ diff -uNr old-lxsession-0.4.2//lxsession-logout/lxsession-logout.c lxsession-0.4 g_signal_connect(G_OBJECT(logout_button), "clicked", G_CALLBACK(logout_clicked), &handler_context); gtk_box_pack_start(GTK_BOX(controls), logout_button, FALSE, FALSE, 4); -@@ -414,6 +416,8 @@ - GtkWidget * shutdown_button = gtk_button_new_with_mnemonic(_("Sh_utdown")); - GtkWidget * image = gtk_image_new_from_icon_name("system-shutdown", GTK_ICON_SIZE_BUTTON); - gtk_button_set_image(GTK_BUTTON(shutdown_button), image); -+ /* align it to left 0.0 as X and 0.0 as Y */ -+ gtk_button_set_alignment(GTK_BUTTON(shutdown_button), 0.0 ,0.0); - g_signal_connect(G_OBJECT(shutdown_button), "clicked", G_CALLBACK(shutdown_clicked), &handler_context); - gtk_box_pack_start(GTK_BOX(controls), shutdown_button, FALSE, FALSE, 4); - } -@@ -424,6 +428,8 @@ - GtkWidget * reboot_button = gtk_button_new_with_mnemonic(_("_Reboot")); - GtkWidget * image = gtk_image_new_from_icon_name("gnome-session-reboot", GTK_ICON_SIZE_BUTTON); - gtk_button_set_image(GTK_BUTTON(reboot_button), image); -+ /* align it to left 0.0 as X and 0.0 as Y */ -+ gtk_button_set_alignment(GTK_BUTTON(reboot_button), 0.0 ,0.0); - g_signal_connect(G_OBJECT(reboot_button), "clicked", G_CALLBACK(reboot_clicked), &handler_context); - gtk_box_pack_start(GTK_BOX(controls), reboot_button, FALSE, FALSE, 4); - } -@@ -434,6 +440,8 @@ - GtkWidget * suspend_button = gtk_button_new_with_mnemonic(_("_Suspend")); - GtkWidget * image = gtk_image_new_from_icon_name("gnome-session-suspend", GTK_ICON_SIZE_BUTTON); - gtk_button_set_image(GTK_BUTTON(suspend_button), image); -+ /* align it to left 0.0 as X and 0.0 as Y */ -+ gtk_button_set_alignment(GTK_BUTTON(suspend_button), 0.0 ,0.0); - g_signal_connect(G_OBJECT(suspend_button), "clicked", G_CALLBACK(suspend_clicked), &handler_context); - gtk_box_pack_start(GTK_BOX(controls), suspend_button, FALSE, FALSE, 4); - } -@@ -444,6 +452,8 @@ - GtkWidget * hibernate_button = gtk_button_new_with_mnemonic(_("_Hibernate")); - GtkWidget * image = gtk_image_new_from_icon_name("gnome-session-hibernate", GTK_ICON_SIZE_BUTTON); - gtk_button_set_image(GTK_BUTTON(hibernate_button), image); -+ /* align it to left 0.0 as X and 0.0 as Y */ -+ gtk_button_set_alignment(GTK_BUTTON(hibernate_button), 0.0 ,0.0); - g_signal_connect(G_OBJECT(hibernate_button), "clicked", G_CALLBACK(hibernate_clicked), &handler_context); - gtk_box_pack_start(GTK_BOX(controls), hibernate_button, FALSE, FALSE, 4); - } -@@ -454,12 +464,16 @@ - GtkWidget * switch_user_button = gtk_button_new_with_mnemonic(_("S_witch User")); - GtkWidget * image = gtk_image_new_from_icon_name("gnome-session-switch", GTK_ICON_SIZE_BUTTON); - gtk_button_set_image(GTK_BUTTON(switch_user_button), image); -+ /* align it to left 0.0 as X and 0.0 as Y */ -+ gtk_button_set_alignment(GTK_BUTTON(switch_user_button), 0.0 ,0.0); - g_signal_connect(G_OBJECT(switch_user_button), "clicked", G_CALLBACK(switch_user_clicked), &handler_context); - gtk_box_pack_start(GTK_BOX(controls), switch_user_button, FALSE, FALSE, 4); - } - /* Create the Cancel button. */ GtkWidget * cancel_button = gtk_button_new_from_stock(GTK_STOCK_CANCEL); + /* align it to left 0.0 as X and 0.0 as Y */ diff --git a/lxsession-0.4.3.tar.bz2 b/lxsession-0.4.3.tar.bz2 new file mode 100644 index 0000000..97dce33 --- /dev/null +++ b/lxsession-0.4.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0833e9e471b0b76e942611743195a5762342acf98eb780b897216b42290bede4 +size 203238 diff --git a/lxsession.changes b/lxsession.changes index 7b7df34..7902e8b 100644 --- a/lxsession.changes +++ b/lxsession.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Mar 18 21:42:38 UTC 2010 - andrea@opensuse.org + +- new upstream version 0.4.3 +- removed fortify-declaration patch (fixed upstream) +- ported lxsession-0.4.2-fix-buttons-position.patch to fit new code +- bug fix release + ------------------------------------------------------------------- Thu Mar 11 08:02:45 UTC 2010 - andrea@opensuse.org diff --git a/lxsession.spec b/lxsession.spec index 38b9054..b3769c0 100644 --- a/lxsession.spec +++ b/lxsession.spec @@ -1,5 +1,5 @@ # -# spec file for package lxsession (Version 0.4.2) +# spec file for package lxsession (Version 0.4.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,15 +19,14 @@ Name: lxsession -Version: 0.4.2 -Release: 2 +Version: 0.4.3 +Release: 1 Summary: LXDE Session Manager, required for running the desktop environment Group: System/GUI/Other License: GPL Url: http://www.lxde.org/ Source0: %{name}-%{version}.tar.bz2 -Patch0: %name-0.4.2-implicit-fortify-decl.patch -Patch1: %name-0.4.2-fix-buttons-position.patch +Patch0: %name-0.4.3-fix-buttons-position.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-glib-devel fdupes gtk2-devel intltool pkg-config BuildRequires: docbook-utils docbook-xsl-stylesheets hal-devel libxslt @@ -45,7 +44,6 @@ Authors: %prep %setup -q -n %name-%version %patch0 -p1 -%patch1 -p1 %build export CFLAGS="$RPM_OPT_FLAGS"