[xfce4-panel] Fix directory menu plugin's 'Open in Terminal' option (#748226)

Christoph Wickert cwickert at fedoraproject.org
Sun Oct 23 17:55:13 UTC 2011


commit 8de2b15a5589007162881a50e63467aabe2bed4e
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Sun Oct 23 19:55:10 2011 +0200

    Fix directory menu plugin's 'Open in Terminal' option (#748226)

 xfce4-panel.spec |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/xfce4-panel.spec b/xfce4-panel.spec
index 6563052..bfef18b 100644
--- a/xfce4-panel.spec
+++ b/xfce4-panel.spec
@@ -12,8 +12,12 @@ Source0:        http://archive.xfce.org/src/xfce/%{name}/%{xfceversion}/%{name}-
 # clock icon taken from system-config-date, license is GPLv2+
 Source1:        xfce4-clock.png
 Source2:        xfce4-clock.svg
+# https://bugzilla.redhat.com/show_bug.cgi?id=748226
+# patch taken from http://git.xfce.org/xfce/xfce4-panel/commit/?id=fad7e1e6
+Patch0:         xfce4-4.8.6-directorymenu-workingdir.patch
+## Downstream patches
 # FIXME: do the patch once SIG has decided about a panel layout
-Patch0:         xfce4-panel-4.8.2-defaults.patch
+Patch10:         xfce4-panel-4.8.2-defaults.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:  libxfce4ui-devel >= %{xfceversion}
 BuildRequires:  garcon-devel >= 0.1.4
@@ -73,7 +77,8 @@ plugins for xfce4-panel.
 
 %prep
 %setup -q
-%patch0 -p1 -b .default
+%patch0 -p1 -b .workingdir
+%patch10 -p1 -b .default
 
 # Fix icon in 'Add new panel item' dialog
 sed -i 's|Icon=office-calendar|Icon=xfce4-clock|g' plugins/clock/clock.desktop.in
@@ -162,6 +167,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_includedir}/xfce4/libxfce4panel-*/
 
 %changelog
+* Sun Oct 23 2011 Christoph Wickert <cwickert at fedoraproject.org> - 4.8.6-2
+- Fix directory menu plugin's 'Open in Terminal' option (#748226)
+
 * Thu Sep 22 2011 Christoph Wickert <cwickert at fedoraproject.org> - 4.8.6-1
 - Update to 4.8.6
 


More information about the scm-commits mailing list