public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/wireshark] f44: Fixing Lua, adding a couple of tools
@ 2026-09-22 19:27 Michal Ruprich
0 siblings, 0 replies; only message in thread
From: Michal Ruprich @ 2026-09-22 19:27 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/wireshark
Branch : f44
Commit : 426e574331cf331c32405a214a2b220316e5a051
Author : Michal Ruprich <mruprich@redhat.com>
Date : 2026-03-06T16:54:15+01:00
Stats : +24/-2 in 2 file(s)
URL : https://src.fedoraproject.org/rpms/wireshark/c/426e574331cf331c32405a214a2b220316e5a051?branch=f44
Log:
Fixing Lua, adding a couple of tools
---
diff --git a/rpminspect.yaml b/rpminspect.yaml
index c1c92dc..e8454ee 100644
--- a/rpminspect.yaml
+++ b/rpminspect.yaml
@@ -4,5 +4,10 @@ ownership:
ignore:
- /usr/bin/dumpcap
+capabilities:
+ #dumpcap is the only binary that has group wireshark
+ ignore:
+ - /usr/bin/dumpcap
+
inspections:
xml: off
diff --git a/wireshark.spec b/wireshark.spec
index 91f2ea2..6e6180c 100644
--- a/wireshark.spec
+++ b/wireshark.spec
@@ -29,6 +29,7 @@ Patch6: wireshark-0006-Move-tmp-to-var-tmp.patch
Patch7: wireshark-0007-cmakelists.patch
Patch8: wireshark-0008-pkgconfig.patch
Patch9: wireshark-0009-remove-strato-manpages.patch
+Patch10: wireshark-0010-find-lua-5.5.patch
#install tshark together with wireshark GUI
Requires: %{name}-cli = %{epoch}:%{version}-%{release}
@@ -129,6 +130,8 @@ Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: %{name}-cli = %{epoch}:%{version}-%{release}
Requires: glibc-devel
Requires: glib2-devel
+Requires: python3-ply
+Requires: omniORB-devel
%description devel
The wireshark-devel package contains the header files, developer
@@ -173,10 +176,21 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.wireshark.Wiresha
#install devel files (inspired by debian/wireshark-dev.header-files)
install -d -m 0755 %{buildroot}%{_includedir}/wireshark
+install -m 0644 %{__cmake_builddir}/config.h %{buildroot}%{_includedir}/wireshark/config.h
IDIR="%{buildroot}%{_includedir}/wireshark"
mkdir -p %{buildroot}%{_udevrulesdir}
-install -m 644 %{SOURCE2} %{buildroot}%{_udevrulesdir}
-install -Dpm 644 %{SOURCE3} %{buildroot}%{_sysusersdir}/%{name}.conf
+install -m 0644 %{SOURCE2} %{buildroot}%{_udevrulesdir}
+install -Dpm 0644 %{SOURCE3} %{buildroot}%{_sysusersdir}/%{name}.conf
+
+#install asn2wrs.py, idl2wrs and make-plugin-reg.py tools
+mkdir -p %{buildroot}%{_libexecdir}/wireshark/pytools
+install -m 0755 tools/asn2wrs.py %{buildroot}%{_libexecdir}/wireshark/pytools/
+install -m 0755 tools/make-plugin-reg.py %{buildroot}%{_libexecdir}/wireshark/pytools/
+install -m 0755 tools/idl2wrs %{buildroot}%{_libexecdir}/wireshark/pytools/
+
+#install idl2wrs dependent scripts
+install -m 0644 tools/wireshark_be.py %{buildroot}%{_libexecdir}/wireshark/pytools/
+install -m 0644 tools/wireshark_gen.py %{buildroot}%{_libexecdir}/wireshark/pytools/
touch %{buildroot}%{_bindir}/%{name}
@@ -279,6 +293,9 @@ fi
%{_libdir}/lib*.so
%{_libdir}/pkgconfig/%{name}.pc
%{_libdir}/cmake/%{name}/*.cmake
+%dir %{_libexecdir}/wireshark/pytools
+%{_libexecdir}/wireshark/pytools/*.py
+%{_libexecdir}/wireshark/pytools/idl2wrs
%changelog
* Wed Mar 04 2026 Michal Ruprich <mruprich@redhat.com> - 1:4.6.4-1
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-09-22 19:27 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-22 19:27 [rpms/wireshark] f44: Fixing Lua, adding a couple of tools Michal Ruprich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox