Merging upstream version 4.4.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 23 insertions, 3 deletions

diff --git a/packaging/rpm/wireshark.spec.in b/packaging/rpm/wireshark.spec.in
index e7ec51ab..4c62131f 100644
--- a/packaging/rpm/wireshark.spec.in
+++ b/packaging/rpm/wireshark.spec.in
@@ -24,6 +24,7 @@
 %bcond_with	bcg729
 %bcond_with	libxml2
 %bcond_with	nghttp2
+%bcond_with	nghttp3
 %bcond_with	sdjournal
 %bcond_with	guides
 %bcond_with	brotli
@@ -120,14 +121,17 @@ BuildRequires:	(c-ares-devel or libcares-devel)
 BuildRequires:	speexdsp-devel
 
 %if %{with lua}
-# We only support Lua before 5.3 (#10881)
-BuildRequires:	(compat-lua-devel < 5.3 or lua51-devel)
+BuildRequires:	(lua-devel or lua53-devel or compat-lua-devel or lua52-devel or lua51-devel)
 %endif
 
 %if %{with nghttp2}
 BuildRequires:	libnghttp2-devel
 %endif
 
+%if %{with nghttp3}
+BuildRequires:	libnghttp3-devel
+%endif
+
 %if %{with sdjournal}
 BuildRequires:	systemd-devel
 %endif
@@ -346,6 +350,13 @@ development of Wireshark scripts and plugins.
 %{?!__cmake_builddir: %global __cmake_builddir %{?__builddir}%{!?__builddir:.}}
 
 %cmake_build
+%if %{with guides}
+%if 0%{?suse_version}
+%cmake_build all_guides
+%else
+%cmake_build --target all_guides
+%endif
+%endif
 
 %install
 
@@ -357,6 +368,8 @@ development of Wireshark scripts and plugins.
 %cmake_install --component Development
 %if %{with guides}
 %cmake_install --component UserGuide
+%cmake_install --component DeveloperGuide
+%cmake_install --component ReleaseNotes
 %endif
 
 # If we're being installed in an unusual prefix tell the loader where
@@ -411,7 +424,10 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %endif
 
 %defattr(-,root,root)
-%doc AUTHORS COPYING NEWS README.md
+%doc AUTHORS COPYING README.md
+%if %{with guides}
+%exclude %{_datadir}/doc/wireshark/wsdg_html_chunked
+%endif
 %{_datadir}/doc/wireshark
 %docdir %{_datadir}/doc/wireshark
 
@@ -480,6 +496,10 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %{_includedir}/wireshark
 %{_libdir}/cmake/wireshark
 %{_libdir}/pkgconfig/wireshark.pc
+%if %{with guides}
+%{_datadir}/doc/wireshark/wsdg_html_chunked
+%docdir %{_datadir}/doc/wireshark/wsdg_html_chunked
+%endif
 
 %changelog
 * Wed Jun 14 2023 Joao Valverde