rpms/xfce4-smartbookmark-plugin/devel xfce4-smartbookmark-plugin-0.4.2-desktop-file.patch, NONE, 1.1 xfce4-smartbookmark-plugin.spec, 1.11, 1.12

[Christoph Wickert]

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-smartbookmark-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5251

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


xfce4-smartbookmark-plugin-0.4.2-desktop-file.patch:

--- NEW FILE xfce4-smartbookmark-plugin-0.4.2-desktop-file.patch ---
--- src/smartbookmark.desktop.in.in.orig	2009-07-04 00:28:14.000000000 +0200
+++ src/smartbookmark.desktop.in.in	2009-07-04 00:34:09.000000000 +0200
@@ -3,6 +3,7 @@
 Encoding=UTF-8
 _Name=SmartBookmark
 _Comment=Query websites from the Xfce panel
-Icon=gtk-preferences
-X-XFCE-Module=@INTERNAL_PLUGIN_PATH@/libsmartbookmark.so
+Icon=gtk-find
+X-XFCE-Module=smartbookmark
+X-XFCE-Module-Path=@INTERNAL_PLUGIN_PATH@
 X-XFCE-Unique=false


Index: xfce4-smartbookmark-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-smartbookmark-plugin/devel/xfce4-smartbookmark-plugin.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- xfce4-smartbookmark-plugin.spec	26 Feb 2009 09:07:36 -0000	1.11
+++ xfce4-smartbookmark-plugin.spec	3 Jul 2009 22:46:04 -0000	1.12
@@ -1,14 +1,20 @@
 Name:		xfce4-smartbookmark-plugin
 Version:	0.4.2
-Release:	8%{?dist}
+Release:	9%{?dist}
 Summary:	Smart bookmarks 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.gz
-Patch0:		%{name}-redhat.patch
-Patch1:		%{name}-0.4.2-multilib.patch
+# 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}-0.4.2-multilib.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=509294
+# not yet in Xfce bugzilla, because the smartbookmark component is missing
+Patch1:		%{name}-0.4.2-desktop-file.patch
+# vendor specific patches
+Patch10:	%{name}-redhat.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	xfce4-panel-devel >= 4.3.99.1, libxfcegui4-devel >= 4.3.90.2
@@ -23,8 +29,9 @@ browser and perform custom searches.
 
 %prep
 %setup -q
-%patch0 -p0 -b .redhat
-%patch1 -p0 -b .multilib
+%patch0 -b .multilib
+%patch1 -b .path
+%patch10 -b .redhat
 
 %build
 %configure --disable-static
@@ -32,7 +39,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}
 
@@ -46,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Fri Jul 03 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-9
+- Fix path in desktop file (#509294)
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.2-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild