rpms/hplip/devel hplip.spec,1.25,1.26

[fedora-cvs-commits at redhat.com]

Author: twaugh

Update of /cvs/dist/rpms/hplip/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15745

Modified Files:
	hplip.spec 
Log Message:
* Fri Oct 14 2005 Tim Waugh <twaugh at redhat.com>
- Don't install desktop file (bug #170762).


Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- hplip.spec	14 Oct 2005 14:29:22 -0000	1.25
+++ hplip.spec	14 Oct 2005 15:05:22 -0000	1.26
@@ -86,14 +86,14 @@
 	%{buildroot}%{_datadir}/cups/model/foomatic-ppds \
 	%{buildroot}%{_datadir}/applications/hplip.desktop
 
-# Desktop file installation.
-mkdir -p %{buildroot}%{_datadir}/applications
-desktop-file-install --vendor HP				\
-	--dir %{buildroot}%{_datadir}/applications		\
-	--add-category X-Red-Hat-Extra				\
-	--add-category Utility					\
-	--add-category Application				\
-	%{buildroot}%{_datadir}/hplip/data/hplip.desktop
+# Don't install desktop file (bug #170762).
+#mkdir -p %{buildroot}%{_datadir}/applications
+#desktop-file-install --vendor HP				\
+#	--dir %{buildroot}%{_datadir}/applications		\
+#	--add-category X-Red-Hat-Extra				\
+#	--add-category Utility					\
+#	--add-category Application				\
+#	%{buildroot}%{_datadir}/hplip/data/hplip.desktop
 
 %clean
 rm -rf %{buildroot}
@@ -109,7 +109,7 @@
 %{_libdir}/cups/backend/hp
 %{_datadir}/hplip
 %{_libdir}/python*/site-packages/*
-%{_datadir}/applications/*.desktop
+#%{_datadir}/applications/*.desktop
 
 %files -n hpijs
 %defattr(-,root,root)
@@ -143,6 +143,7 @@
 
 %changelog
 * Fri Oct 14 2005 Tim Waugh <twaugh at redhat.com>
+- Don't install desktop file (bug #170762).
 - Quieten the hpssd daemon at startup (bug #170762).
 
 * Wed Oct 12 2005 Tim Waugh <twaugh at redhat.com> 0.9.6-2