[arch-commits] Commit in wireshark/trunk (PKGBUILD)

[Frederik Schwan]

    Date: Monday, November 22, 2021 @ 22:18:40
  Author: freswa
Revision: 1054382

upgpkg: wireshark 3.6.0-1

Modified:
  wireshark/trunk/PKGBUILD

----------+
 PKGBUILD |   27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-11-22 21:18:38 UTC (rev 1054381)
+++ PKGBUILD	2021-11-22 22:18:40 UTC (rev 1054382)
@@ -61,18 +61,17 @@
   DESTDIR="${pkgdir}" ninja -C build install
 
   # wireshark uid group is 150
-  install -Dm 644 "${srcdir}/wireshark.sysusers" "${pkgdir}/usr/lib/sysusers.d/wireshark.conf"
-  chgrp 150 "${pkgdir}/usr/bin/dumpcap"
-  chmod 754 "${pkgdir}/usr/bin/dumpcap"
+  install -Dm 644 "${srcdir}"/wireshark.sysusers "${pkgdir}"/usr/lib/sysusers.d/wireshark.conf
+  chgrp 150 "${pkgdir}"/usr/bin/dumpcap
+  chmod 754 "${pkgdir}"/usr/bin/dumpcap
 
   cd "${pkgdir}"
   rm -r usr/share/mime \
     usr/share/icons \
     usr/share/man/man1/wireshark.1 \
-    usr/share/doc/wireshark/wireshark.html \
     usr/bin/wireshark \
-    usr/share/applications/wireshark.desktop \
-    usr/share/appdata/wireshark.appdata.xml
+    usr/share/applications/org.wireshark.Wireshark.desktop \
+    usr/share/metainfo/org.wireshark.Wireshark.metainfo.xml
 }
 
 package_wireshark-qt() {
@@ -89,13 +88,15 @@
   install -d "${srcdir}/staging"
   DESTDIR="${srcdir}/staging" ninja -C build install
 
-  install -Dm 755 build/run/wireshark -t "${pkgdir}/usr/bin"
-  install -Dm 644 build/doc/wireshark.1 -t "${pkgdir}/usr/share/man/man1"
-  install -Dm 644 build/doc/wireshark.html -t "${pkgdir}/usr/share/doc/wireshark"
-  install -Dm 644 wireshark.desktop -t "${pkgdir}/usr/share/applications"
-  install -Dm 644 wireshark.appdata.xml -t "${pkgdir}/usr/share/appdata"
-  install -Dm 644 wireshark-mime-package.xml "${pkgdir}/usr/share/mime/packages/wireshark.xml"
-  mv "${srcdir}/staging/usr/share/icons" "${pkgdir}/usr/share/icons"
+  install -Dm 755 build/run/wireshark -t "${pkgdir}"/usr/bin
+  install -Dm 644 build/doc/wireshark.1 -t "${pkgdir}"/usr/share/man/man1
+  install -Dm 644 build/doc/wireshark.html -t "${pkgdir}"/usr/share/doc/wireshark
+
+  cd "${srcdir}"/staging/usr/share
+  install -Dm 644 applications/org.wireshark.Wireshark.desktop -t "${pkgdir}"/usr/share/applications
+  install -Dm 644 mime/packages/org.wireshark.Wireshark.xml -t "${pkgdir}"/usr/share/mime/packages
+  install -Dm 644 metainfo/org.wireshark.Wireshark.metainfo.xml -t "${pkgdir}"/usr/share/metainfo
+  mv icons "${pkgdir}"/usr/share/icons
 }
 
 # vim: ts=2 sw=2 et: