rpms/lxde-common/F-11 lxde-common-0.4-lxde-logout.desktop.patch, NONE, 1.1 lxde-lock-screen.desktop, NONE, 1.1 lxde-common-0.4-lxpanel-config.patch, 1.2, 1.3 lxde-common.spec, 1.7, 1.8

[Christoph Wickert]

Author: cwickert

Update of /cvs/pkgs/rpms/lxde-common/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20214

Modified Files:
	lxde-common-0.4-lxpanel-config.patch lxde-common.spec 
Added Files:
	lxde-common-0.4-lxde-logout.desktop.patch 
	lxde-lock-screen.desktop 
Log Message:
* Mon May 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.1-2
- Include logout and screenlock buttons (#503919)


lxde-common-0.4-lxde-logout.desktop.patch:

--- NEW FILE lxde-common-0.4-lxde-logout.desktop.patch ---
--- lxde-common-0.4.orig/lxde-logout.desktop.in	2008-11-11 10:47:06.000000000 +0100
+++ lxde-common-0.4/lxde-logout.desktop.in	2009-06-13 18:44:37.000000000 +0200
@@ -1,9 +1,14 @@
 [Desktop Entry]
 Encoding=UTF-8
+Type=Application
 Name=Logout
+Name[de]=Abmelden
+Name[fr]=Déconnexion
 Name[zh_TW]=登出
 Name[fi]=Kirjaudu ulos
 Comment=Logout, shutdown or reboot
+Comment[de]=Abmelden, herunterfahren oder neu starten
+Comment[fr]=Déconnexion, arrêter ou redémarrer
 Comment[zh_TW]=登出、關機、或重新開機
 Comment[fi]=Kirjaudu ulos, sammuta tai käynnistä tietokone uudelleen
 Icon=stock_exit


--- NEW FILE lxde-lock-screen.desktop ---

[Desktop Entry]
Encoding=UTF-8
Type=Application
Name=Lock Screen
Name[de_DE]=Bildschirm sperren
Icon=system-lock-screen
Exec=xdg-screensaver lock
Comment=Lock Screen
Comment[de_DE]=Bildschirm vor unbefugtem Zugriff sperren
StartupNotify=false
NoDisplay=true

lxde-common-0.4-lxpanel-config.patch:

Index: lxde-common-0.4-lxpanel-config.patch
===================================================================
RCS file: /cvs/pkgs/rpms/lxde-common/F-11/lxde-common-0.4-lxpanel-config.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- lxde-common-0.4-lxpanel-config.patch	20 May 2009 11:08:26 -0000	1.2
+++ lxde-common-0.4-lxpanel-config.patch	13 Jun 2009 18:16:53 -0000	1.3
@@ -8,8 +8,8 @@ diff -dur lxde-common-0.4.orig/lxpanel/c
 +Terminal=lxterminal -e
  Logout=lxde-logout
 diff -dur lxde-common-0.4.orig/lxpanel/panel.in lxde-common-0.4/lxpanel/panel.in
---- lxde-common-0.4.orig/lxpanel/panel.in	2008-06-16 10:10:24.000000000 +0200
-+++ lxde-common-0.4/lxpanel/panel.in	2009-05-18 01:49:31.000000000 +0200
+--- lxde-common-0.4.orig/lxpanel/panel.in 
++++ lxde-common-0.4/lxpanel/panel.in 
 @@ -13,9 +13,9 @@
      alpha=0
      setdocktype=1
@@ -53,16 +53,25 @@ diff -dur lxde-common-0.4.orig/lxpanel/p
          }
      }
  }
-@@ -131,11 +135,6 @@
+@@ -122,6 +126,10 @@
  }
  
  Plugin {
--    type = launchbar
--    Config {
--        Button {
--            id=lxde-logout.desktop
--        }
--    }
 +    type = volumealsa
- }
- 
++}
++
++Plugin {
+     type = dclock
+     Config {
+         ClockFmt=%R
+@@ -134,6 +142,9 @@
+     type = launchbar
+     Config {
+         Button {
++            id=lxde-lock-screen.desktop
++        }
++        Button {
+             id=lxde-logout.desktop
+         }
+     }
+


Index: lxde-common.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lxde-common/F-11/lxde-common.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- lxde-common.spec	20 May 2009 11:08:26 -0000	1.7
+++ lxde-common.spec	13 Jun 2009 18:16:53 -0000	1.8
@@ -2,13 +2,16 @@
 
 Name:           lxde-common
 Version:        0.4.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Default configuration files for LXDE
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://lxde.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.bz2
+Source1:        lxde-lock-screen.desktop
+# fix lxde-logout.desktop
+Patch6:         %{name}-0.4-lxde-logout.desktop.patch
 # Distro specific patches
 Patch10:         %{name}-0.3.2.1-pcmanfm-config.patch
 Patch11:         %{name}-0.4-lxpanel-config.patch
@@ -21,6 +24,7 @@ Patch4:         %{name}-0.4-pulseaudio.p
 Patch5:         %{name}-0.3.2.1-gdm-number-of-desktops.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  desktop-file-utils
 Requires:       lxsession lxpanel pcmanfm openbox xdg-utils 
 Requires:       lxmenu-data lxde-settings-daemon
 # Use vendor's artwork
@@ -51,6 +55,7 @@ Desktop Environment.
 %patch12 -p1 -b .orig
 %patch13 -p1 -b .logout-banner
 %patch4 -p1 -b .pulseaudio
+%patch6 -p1 -b .desktop
 %if 0%{?fedora} > 8
 %patch5 -p1 -b .gdm-desktops
 %endif
@@ -67,6 +72,12 @@ make install DESTDIR=$RPM_BUILD_ROOT INS
 rm -rf $RPM_BUILD_ROOT%{_datadir}/icons/nuoveXT2/
 # only used by obsolete lxsession, not lxsession-lite
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/xdg/lxsession/LXDE/default
+desktop-file-install                                           \
+      --dir=%{buildroot}%{_datadir}/applications               \
+      lxde-logout.desktop
+desktop-file-install                                           \
+      --dir=%{buildroot}%{_datadir}/applications               \
+      %{SOURCE1}
 
 
 %clean
@@ -86,9 +97,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/lxpanel/profile/LXDE/
 %{_mandir}/man1/*.1.gz
 %{_datadir}/xsessions/LXDE.desktop
+%{_datadir}/applications/lxde-*.desktop
 
 
 %changelog
+* Mon May 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.1-2
+- Include logout and screenlock buttons (#503919)
+
 * Mon May 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.1-1
 - Update to 0.4.1