diff --git a/wireshark.spec b/wireshark.spec index 8452d9f..7edfd9c 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -3,7 +3,7 @@ %define majver %(echo %version | cut -d. -f1-2) Name: wireshark -Version: 3.4.10 +Version: 4.0.2 Release: 1mamba Summary: A free network protocol analyzer Group: Network/Monitoring @@ -23,6 +23,7 @@ BuildRequires: libgcc BuildRequires: libgcrypt-devel BuildRequires: libglib-devel BuildRequires: libgnutls-devel +BuildRequires: libgpg-error-devel BuildRequires: libkrb5-devel BuildRequires: liblua-devel BuildRequires: liblz4-devel @@ -32,7 +33,7 @@ BuildRequires: libnghttp2-devel BuildRequires: libnl-devel BuildRequires: libopus-devel BuildRequires: libpcap-devel -BuildRequires: libreadline-devel +BuildRequires: libpcre2-devel BuildRequires: libsbc-devel BuildRequires: libsnappy-devel BuildRequires: libspeexdsp-devel @@ -45,7 +46,6 @@ BuildRequires: libzstd-devel BuildRequires: qt5-qtbase-devel ## AUTOBUILDREQ-END BuildRequires: libminizip-devel >= 2.10.0-2mamba -BuildRequires: libmaxminddb-devel BuildRequires: libe2fs-devel BuildRequires: perl BuildRequires: libxslt-devel @@ -55,11 +55,8 @@ BuildRequires: net-snmp-devel BuildRequires: doxygen BuildRequires: python BuildRequires: flex -%if %with_lua -BuildRequires: liblua52-devel -%endif -Obsoletes: ethereal -Provides: ethereal = %{?epoch:%epoch:}%{version}-%{release} +Obsoletes: ethereal < %{version} +Provides: ethereal Requires: %{libname} = %{?epoch:%epoch:}%{version}-%{release} %description @@ -93,7 +90,7 @@ Requires: %{libname} = %{?epoch:%epoch:}%{version}-%{release} %description -n %{libname}-devel Wireshark is a free network protocol analyzer for Unix and Windows. -This package contains static libraries and header files need for development. +This package contains static libraries and header files needed for development. %debug_package @@ -103,49 +100,15 @@ This package contains static libraries and header files need for development. %build #:<< _EOF -%if %with_lua -export LDFLAGS="-ldl `pkg-config --libs lua5.2`" -export CPPFLAGS="%{optflags} -I/usr/include/gtk-3.0" -export CFLAGS="%{optflags} `pkg-config --cflags lua5.2`" -%endif -#% configure \ -# --disable-usr-local \ -# --enable-shared \ -# --disable-static \ -# --enable-dftest \ -# --enable-randpkt \ -# --with-ssl \ -# --enable-wireshark -%cmake \ - -DLUA_LIBRARY=%{_libdir}/liblua5.2.so - -#% if %with_lua -# --with-lua=`pkg-config --cflags lua5.1` -#% endif - -# --without-ucdsnmp \ -# --with-net-snmp \ +%cmake -d build %make -# -j1 %install [ "%{buildroot}" != / ] && rm -rf %{buildroot} -# Workaround -mkdir -p %{buildroot}/ui/gtk/ui -%makeinstall - -##install headers -#for f in epan epan/compress epan/crypt epan/dfilter epan/dissectors \ -# epan/nghttp2 epan/wmem epan/wslua epan/ftypes wiretap; do -# install -d %{buildroot}%{_includedir}/wireshark/$f -# cp $f/*.h %{buildroot}%{_includedir}/wireshark/$f/ -#done -#cp color.h config.h register.h %{buildroot}%{_includedir}/wireshark/ -# -#rm -f %{buildroot}%{_libdir}/%{name}/plugins/%{version}/*.la +%makeinstall -C build %clean [ "%{buildroot}" != / ] && rm -rf %{buildroot} @@ -168,46 +131,19 @@ mkdir -p %{buildroot}/ui/gtk/ui %{_bindir}/sharkd %{_bindir}/text2pcap %{_bindir}/tshark -#%{_bindir}/tfshark %dir %{_datadir}/%{name} -%{_datadir}/%{name}/AUTHORS-SHORT -%{_datadir}/%{name}/COPYING -%{_datadir}/%{name}/*.html -%{_datadir}/%{name}/*.lua -%{_datadir}/%{name}/cfilters -%{_datadir}/%{name}/colorfilters -%{_datadir}/%{name}/dfilters -%{_datadir}/%{name}/dfilter_macros -%dir %{_datadir}/%{name}/diameter -%{_datadir}/%{name}/diameter/* -%{_datadir}/%{name}/dtds -%{_datadir}/%{name}/enterprises.tsv -%{_datadir}/%{name}/manuf -%{_datadir}/%{name}/pdml2html.xsl -%dir %{_datadir}/%{name}/profiles -%{_datadir}/%{name}/profiles/* -%dir %{_datadir}/%{name}/radius -%{_datadir}/%{name}/radius/* -%{_datadir}/%{name}/tpncp -%{_datadir}/%{name}/wka -%dir %{_datadir}/%{name}/wimaxasncp -%{_datadir}/%{name}/wimaxasncp/dictionary.* -%{_datadir}/%{name}/ws.css -%{_datadir}/%{name}/services -%{_datadir}/%{name}/smi_modules +%{_datadir}/%{name}/* %{_mandir}/man?/* %files qt %defattr(-,root,root) %{_bindir}/wireshark -%{_datadir}/applications/%{name}.desktop -%{_datadir}/appdata/wireshark.appdata.xml -%{_datadir}/mime/packages/wireshark.xml -%{_datadir}/icons/hicolor/*/apps/%{name}.png -%{_datadir}/icons/hicolor/*/mimetypes/application-wireshark-doc.png -%{_datadir}/icons/hicolor/scalable/apps/wireshark.svg -%dir %{_datadir}/doc/wireshark -%{_datadir}/doc/wireshark/*.html +%{_datadir}/applications/org.wireshark.Wireshark.desktop +%{_datadir}/metainfo/org.wireshark.Wireshark.metainfo.xml +%{_datadir}/mime/packages/org.wireshark.Wireshark.xml +%{_datadir}/icons/hicolor/*/apps/org.wireshark.Wireshark.png +%{_datadir}/icons/hicolor/*/mimetypes/org.wireshark.Wireshark-mimetype.png +%{_datadir}/icons/hicolor/scalable/apps/org.wireshark.Wireshark.svg %files -n %{libname} %defattr(-,root,root) @@ -236,9 +172,42 @@ mkdir -p %{buildroot}/ui/gtk/ui %{_libdir}/pkgconfig/wireshark.pc %dir %{_libdir}/wireshark/cmake %{_libdir}/wireshark/cmake/*.cmake -%doc NEWS README* +%doc NEWS README.linux %changelog +* Tue Dec 13 2022 Silvan Calarco 4.0.2-1mamba +- update to 4.0.2 + +* Fri Oct 28 2022 Automatic Build System 4.0.1-1mamba +- automatic version update by autodist + +* Sat Oct 08 2022 Automatic Build System 4.0.0-1mamba +- automatic version update by autodist + +* Sat Sep 17 2022 Automatic Build System 3.6.8-1mamba +- automatic version update by autodist + +* Thu Sep 01 2022 Silvan Calarco 3.6.7-1mamba +- update to 3.6.7 + +* Thu Jun 16 2022 Automatic Build System 3.6.6-1mamba +- automatic version update by autodist + +* Fri May 06 2022 Automatic Build System 3.6.5-1mamba +- automatic version update by autodist + +* Sat Mar 26 2022 Automatic Build System 3.6.3-1mamba +- automatic version update by autodist + +* Fri Feb 11 2022 Automatic Build System 3.6.2-1mamba +- automatic version update by autodist + +* Thu Dec 30 2021 Automatic Build System 3.6.1-1mamba +- automatic version update by autodist + +* Wed Dec 08 2021 Silvan Calarco 3.6.0-1mamba +- update to 3.6.0 + * Thu Nov 18 2021 Automatic Build System 3.4.10-1mamba - automatic version update by autodist