SHA256
1
0
forked from pool/wireshark
wireshark/wireshark-pkg-config.patch
Andreas Stieger 219c90669f Accepting request 295150 from home:dimstar:Factory
- 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
2015-04-09 11:43:48 +00:00

55 lines
1.7 KiB
Diff

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