rpms/xfce4-quicklauncher-plugin/F-11 xfce4-quicklauncher-plugin-1.9.4-desktop-file.patch, NONE, 1.1 xfce4-quicklauncher-plugin.spec, 1.14, 1.15

[Christoph Wickert]

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-quicklauncher-plugin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9159

Modified Files:
	xfce4-quicklauncher-plugin.spec 
Added Files:
	xfce4-quicklauncher-plugin-1.9.4-desktop-file.patch 
Log Message:
* Fri Jul 03 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.9.4-5
- Fix path in desktop file (#509294)


xfce4-quicklauncher-plugin-1.9.4-desktop-file.patch:

--- NEW FILE xfce4-quicklauncher-plugin-1.9.4-desktop-file.patch ---
--- panel-plugin/quicklauncher.desktop.in.in.orig	2009-07-04 00:46:34.000000000 +0200
+++ panel-plugin/quicklauncher.desktop.in.in	2009-07-04 00:46:51.000000000 +0200
@@ -4,4 +4,6 @@
 _Name=Quicklauncher
 _Comment=Program with several launchers
 Icon=gnome-fs-executable
-X-XFCE-Module=@INTERNAL_PLUGIN_PATH@/libquicklauncher.so
+X-XFCE-Module=quicklauncher
+X-XFCE-Module-Path=@INTERNAL_PLUGIN_PATH@
+X-XFCE-Unique=false


Index: xfce4-quicklauncher-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-quicklauncher-plugin/F-11/xfce4-quicklauncher-plugin.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- xfce4-quicklauncher-plugin.spec	26 Feb 2009 09:03:43 -0000	1.14
+++ xfce4-quicklauncher-plugin.spec	3 Jul 2009 23:07:31 -0000	1.15
@@ -1,13 +1,18 @@
 Name:		xfce4-quicklauncher-plugin
 Version:	1.9.4
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Quicklauncher plugin for the Xfce panel
 
 Group:		User Interface/Desktops
 License:	GPLv2+
 URL:		http://goodies.xfce.org/projects/panel-plugins/%{name}
 Source0:	http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2
+# Workaround for https://bugzilla.redhat.com/show_bug.cgi?id=505165
+# reported to upstream at http://bugzilla.xfce.org/show_bug.cgi?id=5455
 Patch0:		%{name}-1.9.2-multilib.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=509294
+# upstream bug: http://bugzilla.xfce.org/show_bug.cgi?id=3540
+Patch1:		%{name}-1.9.4-desktop-file.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	xfce4-panel-devel >= 4.3.20, libxfcegui4-devel >= 4.3.20, libxml2-devel
@@ -21,6 +26,7 @@ them on several lines.
 %prep
 %setup -q
 %patch0 -b .multilib
+%patch1 -b .path
 
 %build
 %configure --disable-static
@@ -28,7 +34,7 @@ make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 %find_lang %{name}
 
@@ -42,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Fri Jul 03 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.9.4-5
+- Fix path in desktop file (#509294)
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild