rpms/deskbar-applet/devel deskbar-applet.spec,1.25,1.26

[Luke Macken (lmacken)]

Author: lmacken

Update of /cvs/extras/rpms/deskbar-applet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16701

Modified Files:
	deskbar-applet.spec 
Log Message:
* Sat Aug 19 2006 Luke Macken <lmacken at redhat.com> 2.16.91-2
- Properly install desktop file




Index: deskbar-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/deskbar-applet.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- deskbar-applet.spec	17 Aug 2006 05:28:02 -0000	1.25
+++ deskbar-applet.spec	19 Aug 2006 22:54:07 -0000	1.26
@@ -3,7 +3,7 @@
 
 Name:           deskbar-applet
 Version:        2.15.91
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        A Gnome applet to allow easy access to various search engines
 Group:          Applications/Internet
@@ -15,12 +15,12 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gtk2-devel python-devel pygtk2-devel gnome-python2-extras
 BuildRequires:  gettext evolution-data-server-devel gnome-desktop-devel
-BuildRequires:  libSM-devel gnome-python2-applet
+BuildRequires:  libSM-devel gnome-python2-applet desktop-file-utils
 Requires:       gnome-python2 gnome-python2-applet gnome-python2-bonobo
 Requires:       gnome-python2-gconf pygtk2 gnome-python2-libwnck
 Requires(pre):  GConf2
-Requires(post): GConf2
-Requires(preun): GConf2
+Requires(post): GConf2 desktop-file-utils
+Requires(preun): GConf2 desktop-file-utils
 Provides:       deskbar-applet-fedorabz
 
 %description
@@ -50,6 +50,14 @@
 install -D -m 0644 -p %{SOURCE2} $RPM_BUILD_ROOT$adir
 find $RPM_BUILD_ROOT -name \*.la -exec rm {} \;
 install -D -m 0644 -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/*/apps/deskbar-applet.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
+
+rm $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+desktop-file-install --vendor fedora              \
+    --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+    --add-category X-Fedora                       \
+    --add-category Utility
+    --add-category Application
+
 %{find_lang} %{name}
 
 %clean
@@ -91,6 +99,9 @@
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Sat Aug 19 2006 Luke Macken <lmacken at redhat.com> 2.16.91-2
+- Properly install desktop file
+
 * Wed Aug 17 2006 Luke Macken <lmacken at redhat.com> 2.15.91-1
 - 2.15.91
 - Require gnome-python2-libwnck