rpms/lxsession-lite/F-11 lxsession-lite-0.3.6-icon_search_path_fix-1.patch, NONE, 1.1 lxsession-lite-0.3.6-new-gdm.patch, NONE, 1.1 lxsession-lite-0.3.6-session_name_fix.patch, NONE, 1.1 lxsession-lite.spec, 1.2, 1.3

[Christoph Wickert]

Author: cwickert

Update of /cvs/pkgs/rpms/lxsession-lite/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15410/F-11

Modified Files:
	lxsession-lite.spec 
Added Files:
	lxsession-lite-0.3.6-icon_search_path_fix-1.patch 
	lxsession-lite-0.3.6-new-gdm.patch 
	lxsession-lite-0.3.6-session_name_fix.patch 
Log Message:
* Mon Apr 27 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.6-5
- Fix Session name (Andrew Lee)


lxsession-lite-0.3.6-icon_search_path_fix-1.patch:

--- NEW FILE lxsession-lite-0.3.6-icon_search_path_fix-1.patch ---
diff -Naur lxsession-lite-0.3.6.orig/lxsession-logout/main.c lxsession-lite-0.3.6/lxsession-logout/main.c
--- lxsession-lite-0.3.6.orig/lxsession-logout/main.c	2008-04-26 12:47:19.000000000 -0400
+++ lxsession-lite-0.3.6/lxsession-logout/main.c	2009-04-20 15:03:34.000000000 -0400
@@ -350,7 +350,7 @@
     back = create_background();
 
     gtk_icon_theme_append_search_path( gtk_icon_theme_get_default(),
-                                            PACKAGE_DATA_DIR "/images" );
+                                            PACKAGE_DATA_DIR "/lxsession/images" );
 
     dlg = gtk_dialog_new_with_buttons( _("Logout"), (GtkWindow*)back, GTK_DIALOG_MODAL,
                                                GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, NULL );
diff -Naur lxsession-lite-0.3.6.orig/lxsession-logout/Makefile.am lxsession-lite-0.3.6/lxsession-logout/Makefile.am
--- lxsession-lite-0.3.6.orig/lxsession-logout/Makefile.am	2008-04-26 12:47:19.000000000 -0400
+++ lxsession-lite-0.3.6/lxsession-logout/Makefile.am	2009-04-20 15:05:25.000000000 -0400
@@ -2,7 +2,7 @@
 
 lxsession_logout_CFLAGS =  $(GTK_CFLAGS) $(SM_CFLAGS) $(HAL_CFLAGS) \
 			-DPACKAGE_LOCALE_DIR=\"$(datadir)/locale\" \
-			-DPACKAGE_DATA_DIR=\"$(datadir)/$(DATADIRNAME)\"
+			-DPACKAGE_DATA_DIR=\"$(datadir)\"
 
 lxsession_logout_LDADD = $(GTK_LIBS) $(SM_LIBS) $(HAL_LIBS)
 
diff -Naur lxsession-lite-0.3.6.orig/lxsession-logout/Makefile.in lxsession-lite-0.3.6/lxsession-logout/Makefile.in
--- lxsession-lite-0.3.6.orig/lxsession-logout/Makefile.in	2008-06-08 12:58:13.000000000 -0400
+++ lxsession-lite-0.3.6/lxsession-logout/Makefile.in	2009-04-20 15:04:53.000000000 -0400
@@ -200,7 +200,7 @@
 top_srcdir = @top_srcdir@
 lxsession_logout_CFLAGS = $(GTK_CFLAGS) $(SM_CFLAGS) $(HAL_CFLAGS) \
 			-DPACKAGE_LOCALE_DIR=\"$(datadir)/locale\" \
-			-DPACKAGE_DATA_DIR=\"$(datadir)/$(DATADIRNAME)\"
+			-DPACKAGE_DATA_DIR=\"$(datadir)\"
 
 lxsession_logout_LDADD = $(GTK_LIBS) $(SM_LIBS) $(HAL_LIBS)
 lxsession_logout_SOURCES = \

 	  	 

lxsession-lite-0.3.6-new-gdm.patch:

--- NEW FILE lxsession-lite-0.3.6-new-gdm.patch ---
--- lxsession-lite-0.3.6.orig/lxsession-logout/main.c	2008-04-26 18:47:19.000000000 +0200
+++ lxsession-lite-0.3.6/lxsession-logout/main.c	2008-11-01 06:19:05.000000000 +0100
@@ -435,6 +435,7 @@
 
     /* If GDM is running */
     if( g_file_test("/var/run/gdm_socket", G_FILE_TEST_EXISTS)
+        || g_file_test("/var/run/gdm.pid", G_FILE_TEST_EXISTS)
         || g_file_test("/tmp/.gdm_socket", G_FILE_TEST_EXISTS) )
     {
         btn = create_dlg_btn(_("S_witch User"), "gnome-session-switch", LOGOUT_ACTION_SWITCH_USER );

lxsession-lite-0.3.6-session_name_fix.patch:

--- NEW FILE lxsession-lite-0.3.6-session_name_fix.patch ---

#! /bin/sh /usr/share/dpatch/dpatch-run
## 01_session_name_fix.dpatch by Andrew Lee <andrew at linux.org.tw>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: fix session name other than LXDE can be used.

@DPATCH@
diff -urNad lxsession-lite-0.3.6~/lxsession/lxsession.c lxsession-lite-0.3.6/lxsession/lxsession.c
--- lxsession-lite-0.3.6~/lxsession/lxsession.c	2008-06-08 21:43:07.000000000 +0800
+++ lxsession-lite-0.3.6/lxsession/lxsession.c	2008-12-29 11:48:56.476492960 +0800
@@ -340,7 +340,7 @@
 
     register_signals();
 
-    if ( session_name )
+    if ( !session_name )
         session_name = "LXDE";
 
     g_setenv( "DESKTOP_SESSION", session_name, TRUE );



Index: lxsession-lite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lxsession-lite/F-11/lxsession-lite.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- lxsession-lite.spec	25 Feb 2009 22:22:04 -0000	1.2
+++ lxsession-lite.spec	28 Apr 2009 03:02:46 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           lxsession-lite
 Version:        0.3.6
-Release:        3%{?dist}
+Release:        5%{?dist}
 Summary:        Lightweight X11 session manager
 Summary(de):    Leichtgewichtiger X11 Sitzungsverwalter
 
@@ -8,11 +8,15 @@ Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://lxde.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.gz
+# http://sourceforge.net/tracker/?func=detail&aid=2778757&group_id=180858&atid=894871
+Patch0:         lxsession-lite-0.3.6-icon_search_path_fix-1.patch
+Patch1:         lxsession-lite-0.3.6-session_name_fix.patch
+Patch2:         lxsession-lite-0.3.6-new-gdm.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel > 2.6 libICE-devel libSM-devel dbus-glib-devel
 BuildRequires:  docbook-utils intltool gettext-devel
-Requires:       dbus
+Requires:       hal
 Obsoletes:      lxsession <= 0.3.2-2
 Provides:       lxsession = %{version}-%{release}
 
@@ -32,14 +36,16 @@ GDM. Er ist eine abgespeckte Version von
 Sitzungen zu speichern.
 
 LXSession Lite ist von XSM abgeleitet und wird als Sitzungsverwalter von LXDE,
-der leichtgewichtigen X11 Desktop Umgebung, entwickelt. Auch wenn er Teil von 
-von LXDE ist, ist er komplett Desktop unabhängig und hat nur wenige 
+der leichtgewichtigen X11 Desktop Umgebung, entwickelt. Obwohl er Teil von 
+LXDE ist, ist er komplett Desktop unabhängig und hat nur wenige 
 Abhängigkeiten.
 
 
 %prep
 %setup -q
-
+%patch0 -p1 -b .icon-path
+%patch1 -p1 -b .session-name
+%patch2 -p1 -b .new-gdm
 
 %build
 %configure
@@ -67,6 +73,13 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_sysconfdir}/xdg/lxsession
 
 %changelog
+* Mon Apr 27 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.6-5
+- Fix Session name (Andrew Lee)
+
+* Mon Apr 27 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.6-4
+- Support user switching also with newer gdm
+- Add patch to fix icon search path (Marty Jack)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild