PR#4: fix build on epel8 - rpms/wireshark

rpms / wireshark

#4 fix build on epel8

Closed 3 years ago by mruprich. Opened 3 years ago by loise.

Unknown source master into master

Update wireshark.spec

Marie Loise Nolden • 3 years ago

ac07047

remove fedora ifdef conditions

Marie Loise Nolden • 3 years ago

8c1c3a8

wireshark.spec

file modified

+8 -8

		`@@ -33,7 +33,7 @@`
		`Requires: xdg-utils`
		`Requires: hicolor-icon-theme`

		`- %if %{with_maxminddb} && 0%{?fedora}`
		`+ %if %{with_maxminddb}`
		`Requires: libmaxminddb`
		`%endif`

		`@@ -64,10 +64,10 @@`
		`BuildRequires: qt5-qtmultimedia-devel`
		`BuildRequires: qt5-qtsvg-devel`
		`BuildRequires: zlib-devel`
		`- %if %{with_maxminddb} && 0%{?fedora}`
		`+ %if %{with_maxminddb}`
		`BuildRequires: libmaxminddb-devel`
		`%endif`
		`- %if %{with_lua} && 0%{?fedora}`
		`+ %if %{with_lua}`
		`BuildRequires: compat-lua-devel`
		`%endif`
		`Buildrequires: git`
		`@@ -115,15 +115,15 @@`
		`%autosetup -S git`

		`%build`
		`- %cmake -G "Unix Makefiles" \`
		`+ %cmake \`
		`-DDISABLE_WERROR=ON \`
		`-DBUILD_wireshark=ON \`
		`- %if %{with_lua} && 0%{?fedora}`
		`+ %if %{with_lua}`
		`-DENABLE_LUA=ON \`
		`%else`
		`-DENABLE_LUA=OFF \`
		`%endif`
		`- %if %{with_maxminddb} && 0%{?fedora}`
		`+ %if %{with_maxminddb}`
		`-DBUILD_mmdbresolve=ON \`
		`%else`
		`-DBUILD_mmdbresolve=OFF \`
		`@@ -206,7 +206,7 @@`
		`%{_bindir}/sharkd`
		`%{_bindir}/text2pcap`
		`%{_bindir}/tshark`
		`- %if %{with_maxminddb} && 0%{?fedora}`
		`+ %if %{with_maxminddb}`
		`%{_bindir}/mmdbresolve`
		`%endif`
		`%attr(0750, root, wireshark) %caps(cap_net_raw,cap_net_admin=ep) %{_bindir}/dumpcap`
		`@@ -252,7 +252,7 @@`
		`%{_mandir}/man1/dpauxmon.*`
		`%{_mandir}/man1/sdjournal.*`
		`%{_mandir}/man4/extcap.*`
		`- %if %{with_maxminddb} && 0%{?fedora}`
		`+ %if %{with_maxminddb}`
		`%{_mandir}/man1/mmdbresolve.*`
		`%endif`
		`%dir %{_datadir}/wireshark`

no initial comment

Pull-Request has been closed by mruprich

3 years ago

mruprich commented 3 years ago

Sorry, pagure has played a trick on me. I closed this because it looked like there are no changes with this PR. We can reopen this if you want, but I don't understand the PR. Can you elaborate a little bit?

wireshark is shipped in Fedora as well as in RHEL8. Why do you need this in epel8? What exactly is wrong? Can you show me a build log to see what is wrong?

loise commented 3 years ago

Sure. The changes simpllify the whole thing in so far that everything what is available on fedora is working on rhel as well. The cmake change is needed as cmake otherwise complains about the parameter and doesn't create the makefiles so the build stops.

mruprich commented 3 years ago

But this is intentional... portaudio and compat-lua are no longer available in RHEL8. This way I can keep the same specfile in Fedora and RHEL.