rpms/sylpheed/devel sylpheed.spec,1.81,1.82

[Michael Schwendt (mschwendt)]

Author: mschwendt

Update of /cvs/pkgs/rpms/sylpheed/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28355/d

Modified Files:
	sylpheed.spec 
Log Message:
avoid duplicate desktop menu entry


Index: sylpheed.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sylpheed/devel/sylpheed.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- sylpheed.spec	8 Jun 2008 16:04:34 -0000	1.81
+++ sylpheed.spec	8 Jun 2008 22:31:59 -0000	1.82
@@ -77,11 +77,13 @@
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 install -p -m 644 sylpheed-64x64.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/sylpheed.png
+[ ! -f ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop ] && exit 1
 desktop-file-install --vendor %{desktopvendor} \
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
 	--remove-category Application \
 	--add-category Network \
-	sylpheed.desktop
+    --delete-original \
+	%{_datadir}/applications/%{name}.desktop
 install -d $RPM_BUILD_ROOT%{_mandir}/man1/
 install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1/
 %find_lang %{name}
@@ -102,6 +104,7 @@
 
 %changelog
 * Sun Jun  8 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 2.5.0-0.8.rc2
+- avoid duplicate desktop menu entry
 - conditional BR oniguruma-devel and --enable-oniguruma
 
 * Fri Jun  6 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 2.5.0-0.7.rc2