Stop patching pkg-config
We definitely don't need patching of version (it will be same anyway), adding Qt into requires not only has no sense, but breaking builds. -DHAVE_STDARG_H is stupid as well.. Signed-off-by: Igor Gnatenko <ignatenko@redhat.com>
This commit is contained in:
parent
b9fc4c8c83
commit
3a632b364d
@ -1,25 +0,0 @@
|
|||||||
commit 7a47641e4b8b152264bb5d85807821a3d982eeae
|
|
||||||
Author: Radek Vokal <rvokal@fedoraproject.org>
|
|
||||||
Date: Wed Jan 6 09:37:49 2016 +0100
|
|
||||||
|
|
||||||
Add pkgconfig entry
|
|
||||||
|
|
||||||
diff --git a/wireshark.pc.in b/wireshark.pc.in
|
|
||||||
index 5889178..1e1b62f 100644
|
|
||||||
--- a/wireshark.pc.in
|
|
||||||
+++ b/wireshark.pc.in
|
|
||||||
@@ -6,9 +6,9 @@ sharedlibdir=${libdir}
|
|
||||||
plugindir=@plugindir@
|
|
||||||
|
|
||||||
Name: Wireshark
|
|
||||||
-Description: Network Packet Dissection Library
|
|
||||||
-Version: @VERSION@
|
|
||||||
+Description: Network Traffic Analyzer
|
|
||||||
+Version: @PACKAGE_VERSION@
|
|
||||||
|
|
||||||
-Requires: glib-2.0, gmodule-2.0, gthread-2.0
|
|
||||||
-Libs: -L${libdir} -lwireshark
|
|
||||||
-Cflags: -I${includedir}/wireshark
|
|
||||||
+Requires: Qt, glib-2.0, gmodule-2.0, gthread-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
|
|
@ -5,7 +5,7 @@
|
|||||||
Summary: Network traffic analyzer
|
Summary: Network traffic analyzer
|
||||||
Name: wireshark
|
Name: wireshark
|
||||||
Version: 2.2.5
|
Version: 2.2.5
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
License: GPL+
|
License: GPL+
|
||||||
Group: Applications/Internet
|
Group: Applications/Internet
|
||||||
Url: http://www.wireshark.org/
|
Url: http://www.wireshark.org/
|
||||||
@ -26,8 +26,6 @@ Patch3: wireshark-0003-fix-string-overrun-in-plugins-profinet.patch
|
|||||||
Patch4: wireshark-0004-adds-autoconf-macro-file.patch
|
Patch4: wireshark-0004-adds-autoconf-macro-file.patch
|
||||||
# Fedora-specific
|
# Fedora-specific
|
||||||
Patch5: wireshark-0005-Restore-Fedora-specific-groups.patch
|
Patch5: wireshark-0005-Restore-Fedora-specific-groups.patch
|
||||||
# Will be proposed upstream
|
|
||||||
Patch6: wireshark-0006-Add-pkgconfig-entry.patch
|
|
||||||
# Fedora-specific
|
# Fedora-specific
|
||||||
Patch8: wireshark-0008-move-default-temporary-directory-to-var-tmp.patch
|
Patch8: wireshark-0008-move-default-temporary-directory-to-var-tmp.patch
|
||||||
# Fedora-specific
|
# Fedora-specific
|
||||||
@ -361,7 +359,6 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
|
|||||||
%files
|
%files
|
||||||
|
|
||||||
%files cli
|
%files cli
|
||||||
%{!?_licensedir:%global license %%doc}
|
|
||||||
%license COPYING
|
%license COPYING
|
||||||
%doc AUTHORS INSTALL NEWS README*
|
%doc AUTHORS INSTALL NEWS README*
|
||||||
%{_bindir}/editcap
|
%{_bindir}/editcap
|
||||||
@ -428,9 +425,12 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
|
|||||||
%endif
|
%endif
|
||||||
%{_includedir}/wireshark
|
%{_includedir}/wireshark
|
||||||
%{_libdir}/lib*.so
|
%{_libdir}/lib*.so
|
||||||
%{_libdir}/pkgconfig/*
|
%{_libdir}/pkgconfig/%{name}.pc
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Apr 07 2017 Igor Gnatenko <ignatenko@redhat.com> - 2.2.5-2
|
||||||
|
- Stop patching pkg-config
|
||||||
|
|
||||||
* Tue Mar 07 2017 Martin Sehnoutka <msehnout@redhat.com> - 2.2.5-1
|
* Tue Mar 07 2017 Martin Sehnoutka <msehnout@redhat.com> - 2.2.5-1
|
||||||
- New upstream version 2.2.5
|
- New upstream version 2.2.5
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user