RPM: Make the (optional) maxminddb dependencies actually work.
Move the maxminddb dependencies out of if(qt) and above the RPM's description; this makes them actually work and takes the RPM code for those dependencies out of the Qt RPM's Description (where they clearly weren't doing any good). Change-Id: I01705f8f5f6435571cf521b68f8450730ddaa383 Reviewed-on: https://code.wireshark.org/review/29808 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
This commit is contained in:
parent
bf0ceafaf9
commit
2b9bc5ebef
|
@ -121,6 +121,11 @@ Requires: libnghttp2
|
||||||
#BuildRequires: gnutls-devel
|
#BuildRequires: gnutls-devel
|
||||||
#BuildRequires: libcap-devel
|
#BuildRequires: libcap-devel
|
||||||
|
|
||||||
|
%if %{with mmdbresolve}
|
||||||
|
BuildRequires: libmaxminddb-devel
|
||||||
|
Requires: libmaxminddb
|
||||||
|
%endif
|
||||||
|
|
||||||
%if %{use_wireshark_group}
|
%if %{use_wireshark_group}
|
||||||
%if 0%{?suse_version}
|
%if 0%{?suse_version}
|
||||||
# SuSE's groupadd is in this package:
|
# SuSE's groupadd is in this package:
|
||||||
|
@ -191,20 +196,13 @@ BuildRequires: gcc-c++
|
||||||
BuildRequires: update-desktop-files
|
BuildRequires: update-desktop-files
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%description qt
|
|
||||||
This package contains the Qt Wireshark GUI and desktop integration files.
|
|
||||||
%endif
|
|
||||||
|
|
||||||
|
|
||||||
%if %{with mmdbresolve}
|
|
||||||
BuildRequires: libmaxminddb-devel
|
|
||||||
Requires: libmaxminddb
|
|
||||||
%endif
|
|
||||||
|
|
||||||
# Uncomment these if you want to be sure you get them...
|
# Uncomment these if you want to be sure you get them...
|
||||||
# Add this for more readable fonts on some distributions/versions
|
# Add this for more readable fonts on some distributions/versions
|
||||||
#Requires: dejavu-sans-mono-fonts
|
#Requires: dejavu-sans-mono-fonts
|
||||||
|
|
||||||
|
%description qt
|
||||||
|
This package contains the Qt Wireshark GUI and desktop integration files.
|
||||||
|
%endif
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{name}-%{package_version}
|
%setup -q -n %{name}-%{package_version}
|
||||||
|
@ -436,6 +434,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Sep 24 2018 Jeff Morriss
|
||||||
|
- Make the (optional) maxminddb dependencies actually work.
|
||||||
|
|
||||||
* Wed Apr 11 2018 Gerald Combs
|
* Wed Apr 11 2018 Gerald Combs
|
||||||
- Make documentation installation conditional.
|
- Make documentation installation conditional.
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue