Accepting request 408991 from home:badshah400:branches:network:utilities

- Drop external wireshark.appdata.xml file, use the upstream
  bundled one instead.
- Use the bundled appdata file as a template to generate the
  proper appdata files for both the GTK and QT GUI applications;
  install separate appdata for both apps.

OBS-URL: https://build.opensuse.org/request/show/408991
OBS-URL: https://build.opensuse.org/package/show/network:utilities/wireshark?expand=0&rev=180

wireshark.appdata.xml

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 Richard Hughes <richard@hughsie.com> -->
-<!--
-BugReportURL: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10479
-SentUpstream: 2014-09-18
--->
-<application>
- <id type="desktop">wireshark.desktop</id>
- <metadata_license>CC0-1.0</metadata_license>
- <description>
-  <p>
-   Wireshark is an essential tool to capture and analyze the packets
-   arriving or leaving the network interface.
-   It is almost a GUI equivalent of the classic unix tool tcpdump.
-  </p>
-  <p>
-   Wireshark has a easy to use GUI to capture the packets matching the
-   filter, on the mentioned interface and save them for later analysis.
-  </p>
- </description>
- <url type="homepage">http://www.wireshark.org</url>
- <screenshots>
-  <screenshot type="default">https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/wireshark/a.png</screenshot>
-  <screenshot>https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/wireshark/b.png</screenshot>
- </screenshots>
- <updatecontact>http://www.wireshark.org/lists/</updatecontact>
-</application>

wireshark.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri Jul 15 22:56:50 UTC 2016 - badshah400@gmail.com
+
+- Drop external wireshark.appdata.xml file, use the upstream
+  bundled one instead.
+- Use the bundled appdata file as a template to generate the
+  proper appdata files for both the GTK and QT GUI applications;
+  install separate appdata for both apps.
+
 -------------------------------------------------------------------
 Wed Jun  8 07:44:26 UTC 2016 - astieger@suse.com
 

wireshark.spec

@@ -38,7 +38,6 @@ Url:            https://www.wireshark.org/
 Source:         https://www.wireshark.org/download/src/%{name}-%{version}.tar.bz2
 Source2:        https://www.wireshark.org/download/SIGNATURES-%{version}.txt
 Source3:        https://www.wireshark.org/download/gerald_at_wireshark_dot_org.gpg#/wireshark.keyring
-Source4:        wireshark.appdata.xml
 # PATCH-FIX-OPENSUSE wireshark-1.6.3-disable-warning-dialog.patch bnc#349782 prusnak@suse.cz -- don't show warning when running as root
 Patch1:         wireshark-1.2.0-disable-warning-dialog.patch
 # PATCH-FEATURE-OPENSUSE wireshark-1.2.0-geoip.patch prusnak@suse.cz -- search in /var/lib/GeoIP if user hasn't set any GeoIP folders
@@ -261,9 +260,19 @@ install -d -m 0755 %{buildroot}%{_sysconfdir}
 install -d -m 0755 %{buildroot}%{_mandir}/man1/
 # install -m 0644 *.1 %%{buildroot}%%{_mandir}/man1/
 
-# install appdata file for AppStore integration
+# install separate appdata files corresponding to .desktop files for AppStore integration
 install -d -m0755 %{buildroot}%{_datadir}/appdata
-install %{S:4} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
+
+install wireshark.appdata.xml %{buildroot}%{_datadir}/appdata/%{name}-gtk.appdata.xml
+sed -i -e "/<description>/i \ \ \ \ <name>Wireshark (GTK) Network Analyzer<\/name>" \
+       -e "/<description>/i \ \ \ \ <summary>GTK interface for wireshark network traffic analyzer<\/summary>" \
+       -e "s/wireshark\.desktop/wireshark-gtk.desktop/" \
+    %{buildroot}%{_datadir}/appdata/%{name}-gtk.appdata.xml
+
+install wireshark.appdata.xml %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
+sed -i -e "/<description>/i \ \ \ \ <name>Wireshark (QT) Network Analyzer<\/name>" \
+       -e "/<description>/i \ \ \ \ <summary>QT interface for wireshark network traffic analyzer<\/summary>" \
+    %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
 
 # -devel
 install -d -m 0755  %{buildroot}%{_includedir}/wireshark
@@ -361,7 +370,7 @@ getent group wireshark >/dev/null || groupadd wireshark
 %files ui-gtk
 %defattr(-,root,root)
 %{_bindir}/wireshark-gtk
-%{_datadir}/appdata/wireshark.appdata.xml
+%{_datadir}/appdata/wireshark-gtk.appdata.xml
 %{_datadir}/applications/wireshark-gtk.desktop
 %{_datadir}/pixmaps/wireshark-gtk.png
 
@@ -371,8 +380,9 @@ getent group wireshark >/dev/null || groupadd wireshark
 
 %files ui-qt
 %defattr(-,root,root)
-%dir %{_datadir}/appdata
 %{_bindir}/wireshark
+%dir %{_datadir}/appdata
+%{_datadir}/appdata/wireshark.appdata.xml
 %{_datadir}/applications/wireshark.desktop
 %{_datadir}/pixmaps/wireshark.png