packages: wireshark/wireshark.spec - package .desktop what upstream make no...

[glen]

Author: glen                         Date: Tue Dec  7 12:35:34 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- package .desktop what upstream make no longer does; rel 2

---- Files affected:
packages/wireshark:
   wireshark.spec (1.231 -> 1.232) 

---- Diffs:

================================================================
Index: packages/wireshark/wireshark.spec
diff -u packages/wireshark/wireshark.spec:1.231 packages/wireshark/wireshark.spec:1.232
--- packages/wireshark/wireshark.spec:1.231	Fri Nov 19 23:36:54 2010
+++ packages/wireshark/wireshark.spec	Tue Dec  7 13:35:29 2010
@@ -1,5 +1,6 @@
 # $Revision$, $Date$
 # TODO
+# - use policykit to gain root instead of .desktop file hacks
 # - think of loosing dependency loop:
 #   Executing rpm --upgrade -vh --root /...
 #   error: LOOP:
@@ -25,7 +26,7 @@
 Summary(uk.UTF-8):	Аналізатор мережевого трафіку
 Name:		wireshark
 Version:	1.4.2
-Release:	1
+Release:	2
 License:	GPL
 Group:		Networking/Utilities
 Source0:	http://www.wireshark.org/download/src/%{name}-%{version}.tar.bz2
@@ -252,6 +253,7 @@
 	DESTDIR=$RPM_BUILD_ROOT
 
 cp -a image/hi48-app-wireshark.png $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
+cp -a wireshark.desktop $RPM_BUILD_ROOT%{_desktopdir}
 cp -a wireshark-kde.desktop $RPM_BUILD_ROOT%{_desktopdir}
 
 cp -a wiretap/*.h $RPM_BUILD_ROOT%{_includedir}/wiretap
@@ -279,7 +281,8 @@
 %dir %{_libdir}/%{name}/plugins/%{version}*
 %attr(755,root,root) %{_libdir}/%{name}/plugins/%{version}*/*.so
 %{_datadir}/%{name}
-%{_desktopdir}/*.desktop
+%{_desktopdir}/%{name}.desktop
+%{_desktopdir}/%{name}-kde.desktop
 %{_pixmapsdir}/*.png
 %{_mandir}/man1/wireshark.1*
 
@@ -335,6 +338,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.232  2010/12/07 12:35:29  glen
+- package .desktop what upstream make no longer does; rel 2
+
 Revision 1.231  2010/11/19 22:36:54  rotom
 - 1.4.2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/wireshark/wireshark.spec?r1=1.231&r2=1.232&f=u