rpms/hotwire/devel hotwire.spec,1.23,1.24

[Colin Walters]

Author: walters

Update of /cvs/pkgs/rpms/hotwire/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20562

Modified Files:
	hotwire.spec 
Log Message:
* Thu Dec 18 2008 Colin Walters <walters at redhat.com> - 0.721-3
- Bug 445109 - fix desktop file installation
  Patch from Christian Krause (chkr at plauener.de)



Index: hotwire.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hotwire/devel/hotwire.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- hotwire.spec	29 Nov 2008 16:47:51 -0000	1.23
+++ hotwire.spec	18 Dec 2008 15:05:32 -0000	1.24
@@ -4,7 +4,7 @@
 Summary: Hotwire Shell
 Name: hotwire
 Version: 0.721
-Release: 2%{?dist}
+Release: 3%{?dist}
 Source0: http://hotwire-shell.googlecode.com/files/hotwire-%{version}.zip
 License: GPLv2+
 Group: User Interface/Desktops
@@ -13,11 +13,13 @@
 Url: http://hotwire-shell.org
 BuildRequires: python-devel
 BuildRequires: intltool
+BuildRequires:  desktop-file-utils
 Requires: pygtk2
 Requires: gnome-python2-desktop
 Requires: dbus-python
 Requires: gnome-python2-gnomevfs
-Requires: desktop-file-utils
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
 
 %description
 Hotwire is an object-oriented hypershell.
@@ -42,6 +44,10 @@
 rm -rf $RPM_BUILD_ROOT
 python setup.py install --no-compile --root=$RPM_BUILD_ROOT
 
+desktop-file-install --vendor='hotwire' --delete-original	    \
+    --dir %{buildroot}%{_datadir}/applications			    \
+    %{buildroot}%{_datadir}/applications/hotwire.desktop
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -64,15 +70,20 @@
 %{python_sitelib}/*.egg-info
 
 %post
-desktop-file-install --vendor='hotwire' %{_datadir}/applications/hotwire.desktop 
+update-desktop-database &> /dev/null ||:
 touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 %postun
+update-desktop-database &> /dev/null ||:
 touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 %changelog
+* Thu Dec 18 2008 Colin Walters <walters at redhat.com> - 0.721-3
+- Bug 445109 - fix desktop file installation
+  Patch from Christian Krause (chkr at plauener.de)
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.721-2
 - Rebuild for Python 2.6