rpms/xfce4-websearch-plugin/F-11 xfce4-websearch-plugin-20070428svn2704-desktop-file.patch, NONE, 1.1 xfce4-websearch-plugin.spec, 1.16, 1.17

[Christoph Wickert]

Author: cwickert

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

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


xfce4-websearch-plugin-20070428svn2704-desktop-file.patch:

--- NEW FILE xfce4-websearch-plugin-20070428svn2704-desktop-file.patch ---
--- src/websearch.desktop.in.in.orig	2009-07-04 01:08:31.000000000 +0200
+++ src/websearch.desktop.in.in	2009-07-04 01:35:04.000000000 +0200
@@ -2,6 +2,10 @@
 Type=X-XFCE-PanelPlugin
 Encoding=UTF-8
 _Name=WebSearch
+_Name[de]=Web-Suche
 _Comment=Search the Web directly from the Panel
-Icon=stock_find
-X-XFCE-Module=@INTERNAL_PLUGIN_PATH@/libwebsearch.so
+_Comment[de]=Das Internet direkt aus dem Panel heraus durchsuchen
+Icon=gtk-find
+X-XFCE-Module=websearch
+X-XFCE-Module-Path=@INTERNAL_PLUGIN_PATH@
+X-XFCE-Unique=false


Index: xfce4-websearch-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-websearch-plugin/F-11/xfce4-websearch-plugin.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- xfce4-websearch-plugin.spec	26 Feb 2009 09:15:14 -0000	1.16
+++ xfce4-websearch-plugin.spec	3 Jul 2009 23:51:01 -0000	1.17
@@ -1,6 +1,6 @@
 Name:		xfce4-websearch-plugin
 Version:	0.1.1
-Release:	0.10.20070428svn2704%{?dist}
+Release:	0.11.20070428svn2704%{?dist}
 Summary:	Websearch plugin from the XFCE panel
 
 Group:		User Interface/Desktops
@@ -11,7 +11,12 @@ URL:		http://goodies.xfce.org/
 # tar -cjf xfce4-websearch-plugin-`date +%G%m%d`svn2704.tar.bz2 xfce4-websearch-plugin
 Source0:	%{name}-20070428svn2704.tar.bz2
 #Source0:	http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.gz
+# 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}-20070428svn2704-multilib.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=509294
+# not yet in Xfce bugzilla, because the websearch component is missing
+Patch1:		%{name}-20070428svn2704-desktop-file.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	xfce4-panel-devel >= 4.3.0, libxfcegui4-devel >= 4.3.0, libxml2-devel
@@ -26,6 +31,7 @@ Access searchengines from the XFCE panel
 %setup -qn %{name}
 ./autogen.sh
 %patch0 -b .multilib
+%patch1 -b .path
 
 %build
 %configure --disable-static
@@ -33,7 +39,7 @@ make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
+make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} INSTALL="install -p"
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 %find_lang %{name}
 
@@ -47,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.1.1-0.11.20070428svn2704
+- Fix path in desktop file (#509294)
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.1-0.10.20070428svn2704
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild