PR#9: Drop gating for python3-devel dependency - rpms/wireshark

rpms / wireshark

#9 Drop gating for python3-devel dependency

Merged 2 years ago by mruprich. Opened 2 years ago by dcavalca.

rpms/ dcavalca/wireshark python into rawhide

Drop gating for python3-devel dependency

Davide Cavalca • 2 years ago

bccd187

wireshark.spec

file modified

+4 -3

		`@@ -8,7 +8,7 @@`
		`Summary: Network traffic analyzer`
		`Name: wireshark`
		`Version: 3.6.7`
		`- Release: 1%{?dist}`
		`+ Release: 2%{?dist}`
		`Epoch: 1`
		`License: GPL+`
		`Url: http://www.wireshark.org/`
		`@@ -76,9 +76,7 @@`
		`BuildRequires: compat-lua-devel`
		`%endif`
		`Buildrequires: git-core`
		`- %if 0%{?fedora}`
		`Buildrequires: python3-devel`
		`- %endif`
		`Buildrequires: cmake`
		`#needed for sdjournal external capture interface`
		`BuildRequires: systemd-devel`
		`@@ -276,6 +274,9 @@`
		`%{_libdir}/pkgconfig/%{name}.pc`

		`%changelog`
		`+ * Mon Aug 01 2022 Davide Cavalca <dcavalca@fedoraproject.org> - 1:3.6.7-2`
		`+ - Drop gating for python3-devel dependency`
		`+`
		`* Thu Jul 28 2022 Michal Ruprich <mruprich@redhat.com> - 1:3.6.7-1`
		`- New version 3.6.7`

dcavalca commented 2 years ago

Dropping this makes it possible to build wireshark for RHEL and CentOS (otherwise it'll complain about missing Python). We'd like to ship an updated wireshark package for CentOS Stream 8 as part of the CentOS Hyperscale SIG and this would make it possible to do so without having to carry a patch on top of the Fedora packaging.

rebased onto bd9dbd51986cce5e695716f05dcf9a2df4647d6b

2 years ago

mruprich commented 2 years ago

Hi Davide,
just a quick question - how is this blocking anything? I thought that CentOS Stream 8 is built from RHEL8, not from Fedora. There is no condition on Fedora in any RHEL branch. I am going to use this PR since it no longer makes sense to have, so thanks for that. Just a bit confused here as to where does the Stream actually come from...

mruprich commented 2 years ago

Oh, sorry I rebased the package before looking here, can I ask you to rebase the PR on top of the latest version? Thanks.

rebased onto bccd187

2 years ago

dcavalca commented 2 years ago

I've rebased this, thanks! On your question: Fedora is where new CentOS Stream releases branch from (e.g. CentOS Stream 10 will most likely branch from Fedora 40), and RHEL releases are built from CentOS Stream. You can think of CentOS Stream as a continuously delivered distribution that constantly tracks the next minor release of RHEL (so e.g. CentOS Stream 9 tracks what will eventually show up in RHEL 9.X+1 where X is the current point release).

In this specific case, we're maintaining a backport of wireshark in the CentOS Hyperscale SIG that is based off the Fedora packaging, so that users on CentOS Stream 8 can have access to a more up to date version if they so desire. These kind of backports are a lot easier to maintain if we don't need to carry additional changes on our end, hence this PR to get the gating fix upstreamed.