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

[Michael Schwendt]

Author: mschwendt

Update of /cvs/extras/rpms/gqview/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17990

Modified Files:
	gqview.spec 
Log Message:
no build, drop old guard, reuse %%desktopvendor


Index: gqview.spec
===================================================================
RCS file: /cvs/extras/rpms/gqview/devel/gqview.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- gqview.spec	15 May 2008 20:46:26 -0000	1.23
+++ gqview.spec	13 Feb 2009 19:14:56 -0000	1.24
@@ -1,3 +1,7 @@
+# should be vendor 'fedora', but that would break upgrades for
+# people who have linked the desktop icon
+%define desktopvendor gnome
+
 Summary: Image browser and viewer
 Name: gqview
 Version: 2.0.4
@@ -46,12 +50,9 @@
 #install -p -m 0644 ChangeLog COPYING README TODO \
 #    ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}
 
-# should be '--vendor fedora', but that would break upgrades for
-# people who have linked the desktop icon
-[ ! -f ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop ] && exit 1
 desktop-file-install \
 	--delete-original \
-	--vendor gnome \
+	--vendor %{desktopvendor} \
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
 	$RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
@@ -76,7 +77,7 @@
 %{_bindir}/%{name}
 %{_mandir}/man1/%{name}.1*
 %{_datadir}/pixmaps/%{name}.png
-%{_datadir}/applications/gnome-%{name}.desktop
+%{_datadir}/applications/%{desktopvendor}-%{name}.desktop
 
 
 %changelog