rpms/wireshark
7
0
Fork 0
Code Issues Pull Requests Releases Activity
52325a8a08
wireshark/wireshark-0006-Add-pkgconfig-entry.patch

60 lines
1.7 KiB
Diff
Raw Normal View History

Bugfixes and enhancements - Convert automake/pkgconfig files into patches (better upstream integration) - Restored category in the *.desktop file - Install another one necessary header file - frame_data_sequence.h Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
2013-09-13 12:52:45 +00:00
From: =?UTF-8?q?Radek=20Vok=C3=A1l?= <rvokal@fedoraproject.org>
Date: Thu, 17 Dec 2009 09:17:07 +0000
Updated RTPproxy dissector Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
2013-11-13 11:53:53 +00:00
Subject: [PATCH] Add pkgconfig entry
Bugfixes and enhancements - Convert automake/pkgconfig files into patches (better upstream integration) - Restored category in the *.desktop file - Install another one necessary header file - frame_data_sequence.h Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
2013-09-13 12:52:45 +00:00
diff --git a/Makefile.am b/Makefile.am
Wireshark ver. 1.12.0 - Dropped a lot of outdated patches. - Added /usr/sbin/captype application. - Added temporary workaround for wireshark.pc.in missing in the official tarball. - Removed outdated --with-dumpcap-group="wireshark" cli switch. It doesn't work during rpmbuild, and we still set group explicitly in the 'files' section. - Removed --enable-setcap-install. Likewise. - Some ANSI C header files were moved to epan/ Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
2014-08-07 14:35:19 +00:00
index c60d873..40a6e4d 100644
Bugfixes and enhancements - Convert automake/pkgconfig files into patches (better upstream integration) - Restored category in the *.desktop file - Install another one necessary header file - frame_data_sequence.h Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
2013-09-13 12:52:45 +00:00
--- a/Makefile.am
+++ b/Makefile.am
Wireshark ver. 1.12.0 - Dropped a lot of outdated patches. - Added /usr/sbin/captype application. - Added temporary workaround for wireshark.pc.in missing in the official tarball. - Removed outdated --with-dumpcap-group="wireshark" cli switch. It doesn't work during rpmbuild, and we still set group explicitly in the 'files' section. - Removed --enable-setcap-install. Likewise. - Some ANSI C header files were moved to epan/ Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
2014-08-07 14:35:19 +00:00
@@ -53,6 +53,9 @@ EXTRA_PROGRAMS = wireshark wireshark-qt tshark tfshark capinfos captype editcap
mergecap dftest randpkt text2pcap dumpcap reordercap rawshark \
wireshark_cxx echld_test
Bugfixes and enhancements - Convert automake/pkgconfig files into patches (better upstream integration) - Restored category in the *.desktop file - Install another one necessary header file - frame_data_sequence.h Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
2013-09-13 12:52:45 +00:00
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = wireshark.pc
+
#
# Wireshark configuration files are put in $(pkgdatadir).
#
diff --git a/configure.ac b/configure.ac
Wireshark ver. 1.12.0 - Dropped a lot of outdated patches. - Added /usr/sbin/captype application. - Added temporary workaround for wireshark.pc.in missing in the official tarball. - Removed outdated --with-dumpcap-group="wireshark" cli switch. It doesn't work during rpmbuild, and we still set group explicitly in the 'files' section. - Removed --enable-setcap-install. Likewise. - Some ANSI C header files were moved to epan/ Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
2014-08-07 14:35:19 +00:00
index 20eb3b3..8c9b79c 100644
Bugfixes and enhancements - Convert automake/pkgconfig files into patches (better upstream integration) - Restored category in the *.desktop file - Install another one necessary header file - frame_data_sequence.h Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
2013-09-13 12:52:45 +00:00
--- a/configure.ac
+++ b/configure.ac
Wireshark ver. 1.12.0 - Dropped a lot of outdated patches. - Added /usr/sbin/captype application. - Added temporary workaround for wireshark.pc.in missing in the official tarball. - Removed outdated --with-dumpcap-group="wireshark" cli switch. It doesn't work during rpmbuild, and we still set group explicitly in the 'files' section. - Removed --enable-setcap-install. Likewise. - Some ANSI C header files were moved to epan/ Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
2014-08-07 14:35:19 +00:00
@@ -2779,6 +2779,7 @@ AC_CONFIG_HEADERS(config.h)
Bugfixes and enhancements - Convert automake/pkgconfig files into patches (better upstream integration) - Restored category in the *.desktop file - Install another one necessary header file - frame_data_sequence.h Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
2013-09-13 12:52:45 +00:00
AC_OUTPUT(
Makefile
doxygen.cfg
+ wireshark.pc
asn1/Makefile
_CUSTOM_ASN1_AC_OUTPUT_
asn1/acp133/Makefile
diff --git a/wireshark.pc.in b/wireshark.pc.in
Wireshark ver. 1.12.0 - Dropped a lot of outdated patches. - Added /usr/sbin/captype application. - Added temporary workaround for wireshark.pc.in missing in the official tarball. - Removed outdated --with-dumpcap-group="wireshark" cli switch. It doesn't work during rpmbuild, and we still set group explicitly in the 'files' section. - Removed --enable-setcap-install. Likewise. - Some ANSI C header files were moved to epan/ Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
2014-08-07 14:35:19 +00:00
index 91bf28b..2e2fcdc 100644
--- a/wireshark.pc.in
Bugfixes and enhancements - Convert automake/pkgconfig files into patches (better upstream integration) - Restored category in the *.desktop file - Install another one necessary header file - frame_data_sequence.h Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
2013-09-13 12:52:45 +00:00
+++ b/wireshark.pc.in
Wireshark ver. 1.12.0 - Dropped a lot of outdated patches. - Added /usr/sbin/captype application. - Added temporary workaround for wireshark.pc.in missing in the official tarball. - Removed outdated --with-dumpcap-group="wireshark" cli switch. It doesn't work during rpmbuild, and we still set group explicitly in the 'files' section. - Removed --enable-setcap-install. Likewise. - Some ANSI C header files were moved to epan/ Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
2014-08-07 14:35:19 +00:00
@@ -1,14 +1,11 @@
-prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=${prefix}
-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
-sharedlibdir=${libdir}
-includedir=${prefix}/include/wireshark
-plugindir=@PLUGIN_INSTALL_DIR@
Bugfixes and enhancements - Convert automake/pkgconfig files into patches (better upstream integration) - Restored category in the *.desktop file - Install another one necessary header file - frame_data_sequence.h Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
2013-09-13 12:52:45 +00:00
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
Wireshark ver. 1.12.0 - Dropped a lot of outdated patches. - Added /usr/sbin/captype application. - Added temporary workaround for wireshark.pc.in missing in the official tarball. - Removed outdated --with-dumpcap-group="wireshark" cli switch. It doesn't work during rpmbuild, and we still set group explicitly in the 'files' section. - Removed --enable-setcap-install. Likewise. - Some ANSI C header files were moved to epan/ Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
2014-08-07 14:35:19 +00:00
Name: wireshark
-Description: wireshark network packet dissection library
-Version: @PROJECT_VERSION@
-
-Requires:
-Libs: -L${libdir} -L${sharedlibdir} -lwireshark
-Cflags: -I${includedir}
Bugfixes and enhancements - Convert automake/pkgconfig files into patches (better upstream integration) - Restored category in the *.desktop file - Install another one necessary header file - frame_data_sequence.h Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
2013-09-13 12:52:45 +00:00
+Description: Network Traffic Analyzer
+Version: @PACKAGE_VERSION@
+Requires: glib-2.0 gmodule-2.0
+Libs: -L@libdir@ -lwireshark -lwiretap
+Cflags: -DWS_VAR_IMPORT=extern -DHAVE_STDARG_H -DWS_MSVC_NORETURN= -I@includedir@/wireshark -I@includedir@/wireshark/epan
Reference in New Issue Copy Permalink