[lxde-common] Fix lxpanel quicklauncher icons (#1028063)

[Christoph Wickert]

commit 46ff7a41f05c8377156035119cba506c3e5576db
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Tue Nov 26 20:34:32 2013 +0100

    Fix lxpanel quicklauncher icons (#1028063)
    
    - Remove netstat and cpu plugins from default panel config
    - Minor lxpanel config file tweaks
    - Improve English comment of "Lock Screen" launcher

 lxde-common-0.5.5-lxpanel-config.patch |   33 ++++++++++++++++++++++++++-----
 lxde-common.spec                       |   21 ++++++++++++++++---
 lxde-lock-screen.desktop               |    2 +-
 3 files changed, 45 insertions(+), 11 deletions(-)
---
diff --git a/lxde-common-0.5.5-lxpanel-config.patch b/lxde-common-0.5.5-lxpanel-config.patch
index 8b0e432..6462a94 100644
--- a/lxde-common-0.5.5-lxpanel-config.patch
+++ b/lxde-common-0.5.5-lxpanel-config.patch
@@ -1,6 +1,5 @@
-diff -dur lxde-common-0.5.0.orig/lxpanel/panel.in lxde-common-0.5.0/lxpanel/panel.in
---- lxde-common-0.5.0.orig/lxpanel/panel.in	2008-06-16 10:10:24.000000000 +0200
-+++ lxde-common-0.5.0/lxpanel/panel.in	2009-12-12 14:48:17.000000000 +0100
+--- lxde-common.orig/lxpanel/panel.in	2011-03-28 01:45:41.000000000 +0200
++++ lxde-common/lxpanel/panel.in	2013-11-26 20:12:16.570392526 +0100
 @@ -13,9 +13,9 @@
      alpha=0
      setdocktype=1
@@ -13,7 +12,7 @@ diff -dur lxde-common-0.5.0.orig/lxpanel/panel.in lxde-common-0.5.0/lxpanel/pane
      backgroundfile=@prefix@/share/lxpanel/images/background.png
  }
  
-@@ -29,12 +29,13 @@
+@@ -29,18 +29,19 @@
  Plugin {
      type = menu
      Config {
@@ -24,10 +23,17 @@ diff -dur lxde-common-0.5.0.orig/lxpanel/panel.in lxde-common-0.5.0/lxpanel/pane
          separator {
          }
          item {
-+            image=gnome-run
++            image=system-run
              command=run
          }
          separator {
+         }
+         item {
+-            image=gnome-logout
++            image=system-logout
+             command=logout
+         }
+     }
 @@ -50,10 +51,10 @@
      type = launchbar
      Config {
@@ -49,7 +55,22 @@ diff -dur lxde-common-0.5.0.orig/lxpanel/panel.in lxde-common-0.5.0/lxpanel/pane
      }
  }
  
-@@ -134,6 +136,9 @@
+@@ -110,14 +112,6 @@
+ }
+ 
+ Plugin {
+-    type = netstat
+-}
+-
+-Plugin {
+-    type = cpu
+-}
+-
+-Plugin {
+     type = tray
+ }
+ 
+@@ -134,6 +128,9 @@
      type = launchbar
      Config {
          Button {
diff --git a/lxde-common.spec b/lxde-common.spec
index ff1eecf..d8a3fd5 100644
--- a/lxde-common.spec
+++ b/lxde-common.spec
@@ -18,7 +18,7 @@
 
 Name:           lxde-common
 Version:        0.5.5
-Release:        0.7%{?git_version:.%{?git_version}}%{?dist}
+Release:        0.8%{?git_version:.%{?git_version}}%{?dist}
 Summary:        Default configuration files for LXDE
 
 Group:          User Interface/Desktops
@@ -77,6 +77,13 @@ Desktop Environment.
 %patch13 -p1 -b .logout-banner
 %patch15 -p1 -b .vendor
 
+# Fedora >= 19 doesn't use vendor prefixes for desktop files. Instead of
+# maintaining two patches we just strip the prefixes from the files we just
+# patched with patch 100.
+%if (0%{?fedora} && 0%{?fedora} < 19) || (0%{?rhel} && 0%{?rhel} < 7)
+sed -i 's|id=fedora-|id=|' lxpanel/panel.in
+%endif
+
 # Calling autotools must be done before executing
 # configure if needed
 autoreconf -fi
@@ -86,8 +93,8 @@ autoreconf -fi
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot} INSTALL='install -p'
 desktop-file-install                                           \
       --remove-key=Encoding                                    \
       --dir=%{buildroot}%{_datadir}/applications               \
@@ -100,7 +107,7 @@ install -pm 0644 %{SOURCE2} %{buildroot}%{_datadir}/applications/
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %files
@@ -122,6 +129,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Nov 26 2013 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.5-0.8.20110328git87c368d7
+- Fix lxpanel quicklauncher icons (#1028063)
+- Remove netstat and cpu plugins from default panel config
+- Minor lxpanel config file tweaks
+- Improve English comment of "Lock Screen" launcher
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.5-0.7.20110328git87c368d7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/lxde-lock-screen.desktop b/lxde-lock-screen.desktop
index 3169d9f..2264fc3 100644
--- a/lxde-lock-screen.desktop
+++ b/lxde-lock-screen.desktop
@@ -4,7 +4,7 @@ Name=Lock Screen
 Name[de_DE]=Bildschirm sperren
 Icon=system-lock-screen
 Exec=xdg-screensaver lock
-Comment=Lock Screen
+Comment=Lock Screen to prevent unauthorized usage
 Comment[de_DE]=Bildschirm vor unbefugtem Zugriff sperren
 StartupNotify=false
 NoDisplay=true