pool/wireshark
SHA256
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 295150 from home:dimstar:Factory

Browse Source 
- Add wireshark-pkg-config.patch: actually install wireshark.pc,
  which is part of the tarball. Seems only cmake based setup
  handles this for upstream.
- Add wireshark.appdata.xml in order to show up in AppStream based
  appstores.

OBS-URL: https://build.opensuse.org/request/show/295150
OBS-URL: https://build.opensuse.org/package/show/network:utilities/wireshark?expand=0&rev=138
This commit is contained in:
Andreas Stieger 2015-04-09 11:43:48 +00:00 committed by Git OBS Bridge
parent cb3179d09b
commit 219c90669f
4 changed files with 100 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
wireshark-pkg-config.patch Normal file
View File

@ -0,0 +1,54 @@
Index: wireshark-1.12.4/Makefile.am
===================================================================
--- wireshark-1.12.4.orig/Makefile.am
+++ wireshark-1.12.4/Makefile.am
@@ -59,6 +59,10 @@ EXTRA_PROGRAMS = wireshark wireshark-qt
dist_pkgdata_DATA = COPYING manuf services cfilters colorfilters dfilters \
smi_modules ipmap.html pdml2html.xsl
+# wireshark.pc is created by configure out of wireshark.pc.in
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = wireshark.pc
+
#
# Install global profiles in the "profiles" subdirectory
#
Index: wireshark-1.12.4/configure.ac
===================================================================
--- wireshark-1.12.4.orig/configure.ac
+++ wireshark-1.12.4/configure.ac
@@ -2814,6 +2814,7 @@ AC_CONFIG_HEADERS(config.h)
AC_OUTPUT(
Makefile
doxygen.cfg
+ wireshark.pc
asn1/Makefile
_CUSTOM_ASN1_AC_OUTPUT_
asn1/acp133/Makefile
Index: wireshark-1.12.4/wireshark.pc.in
===================================================================
--- wireshark-1.12.4.orig/wireshark.pc.in
+++ wireshark-1.12.4/wireshark.pc.in
@@ -1,14 +1,12 @@
-prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=${prefix}
-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
-sharedlibdir=${libdir}
-includedir=${prefix}/include/wireshark
-plugindir=@PLUGIN_INSTALL_DIR@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
Name: wireshark
Description: wireshark network packet dissection library
-Version: @PROJECT_VERSION@
+Version: @PACKAGE_VERSION@
-Requires:
-Libs: -L${libdir} -L${sharedlibdir} -lwireshark
-Cflags: -I${includedir}
+Requires: glib-2.0 gmodule-2.0
+Libs: -L${libdir} -lwireshark
+Cflags: -I${includedir}/wireshark

27
wireshark.appdata.xml Normal file
View File

@ -0,0 +1,27 @@
<?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>

9
wireshark.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Thu Apr 9 10:23:11 UTC 2015 - dimstar@opensuse.org
- Add wireshark-pkg-config.patch: actually install wireshark.pc,
which is part of the tarball. Seems only cmake based setup
handles this for upstream.
- Add wireshark.appdata.xml in order to show up in AppStream based
appstores.
-------------------------------------------------------------------
Wed Mar 4 19:31:18 UTC 2015 - astieger@suse.com

10
wireshark.spec
View File

@ -34,6 +34,7 @@ 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
@ -41,6 +42,7 @@ Patch2: wireshark-1.2.0-geoip.patch
Patch4: wireshark-1.10.0-enable_lua.patch
Patch5: wireshark-1.10.0-authors-pod2man.patch
Patch6: wireshark-1.12.x-allow-gdk-pixbuf-deprecation.patch
Patch7: wireshark-pkg-config.patch
BuildRequires: bison
BuildRequires: cairo-devel
BuildRequires: flex
@ -180,6 +182,7 @@ sed \
%patch5 -p1
%patch6 -p1
%patch7 -p1
%build
# for patch6 wireshark-1.12.x-allow-gdk-pixbuf-deprecation.patch
@ -230,6 +233,10 @@ 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 -d -m0755 %{buildroot}%{_datadir}/appdata
install %{S:4} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
# -devel
install -d -m 0755 %{buildroot}%{_includedir}/wireshark
IDIR="${RPM_BUILD_ROOT}%{_includedir}/wireshark"
@ -313,12 +320,15 @@ getent group wireshark >/dev/null || groupadd wireshark
%doc doc/README.*
%{_includedir}/wireshark
%{_libdir}/lib*.so
%{_libdir}/pkgconfig/wireshark.pc
%if %{with gtk}
%files ui-gtk
%defattr(-,root,root)
%{_bindir}/wireshark
%dir %{_datadir}/appdata
%{_datadir}/appdata/wireshark.appdata.xml
%{_datadir}/applications/wireshark.desktop
%{_datadir}/pixmaps/wireshark.png