aboutsummaryrefslogtreecommitdiffstats
path: root/packaging/rpm
diff options
context:
space:
mode:
authorPeter Wu <peter@lekensteyn.nl>2019-09-23 01:06:57 +0100
committerAnders Broman <a.broman58@gmail.com>2019-09-23 08:50:10 +0000
commitceb2ee2e444099c69f00ad2bd234ab8b78bda2de (patch)
tree19f50cf23b066888f894db141058f64d1c73db66 /packaging/rpm
parente52f33f66c979ac493fa738005815bb01d5304a8 (diff)
rpm: use python3 to fix CentOS 7 builds
CentOS 7 (1908) started including python3 (Python 3.6), see https://wiki.centos.org/Manuals/ReleaseNotes/CentOS7.1908 Change-Id: I6418e7839f1119cf1152f445759e92acd4f39cc4 Reviewed-on: https://code.wireshark.org/review/34593 Reviewed-by: Dario Lombardo <lomato@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'packaging/rpm')
-rw-r--r--packaging/rpm/wireshark.spec.in5
1 files changed, 2 insertions, 3 deletions
diff --git a/packaging/rpm/wireshark.spec.in b/packaging/rpm/wireshark.spec.in
index 6e600186fb..cd5aa055d6 100644
--- a/packaging/rpm/wireshark.spec.in
+++ b/packaging/rpm/wireshark.spec.in
@@ -51,11 +51,10 @@ BuildRoot: /tmp/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if 0%{?rhel}
BuildRequires: cmake3 >= 3.5
-BuildRequires: python34
%else
BuildRequires: cmake >= 3.5
-BuildRequires: python3
%endif
+BuildRequires: python3
BuildRequires: gcc
BuildRequires: perl
BuildRequires: flex
@@ -506,7 +505,7 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%{_libdir}/pkgconfig/wireshark.pc
%changelog
-* Wed Aug 15 2019 Gerald Combs
+* Thu Aug 15 2019 Gerald Combs
- Add zstd
* Mon Apr 22 2019 Daniel Bakai