Browse Source

wireshark-4.0.1-1

Tomohiro "Tomo-p" KATO 1 year ago
parent
commit
eb42a459e8
1 changed files with 19 additions and 43 deletions
  1. 19 43
      w/wireshark/wireshark-vl.spec

+ 19 - 43
w/wireshark/wireshark-vl.spec

@@ -7,7 +7,7 @@
 Summary: 	Network traffic analyzer
 Summary(ja):	ネットワークトラフィック解析プログラム
 Name: 		wireshark
-Version:	3.4.7
+Version:	4.0.1
 Release: 	1%{_dist_release}
 Group: 		network,admin-tools
 Vendor:		Project Vine
@@ -20,10 +20,15 @@ Source0:	https://1.as.dl.wireshark.org/src/%{name}-%{version}.tar.xz
 Source1:	wireshark.pam
 Source2:	wireshark.console
 Source4:	90-wireshark-usbmon.rules
+# Fedora-specific
 Patch2:		wireshark-0002-Customize-permission-denied-error.patch
+# Will be proposed upstream
 Patch3:		wireshark-0003-fix-string-overrun-in-plugins-profinet.patch
+# Fedora-specific
 Patch4:		wireshark-0004-Restore-Fedora-specific-groups.patch
+# Fedora-specific
 Patch5:		wireshark-0005-Fix-paths-in-a-wireshark.desktop-file.patch
+# Fedora-specific
 Patch6:		wireshark-0006-Move-tmp-to-var-tmp.patch
 Patch7:		wireshark-0007-cmakelists.patch
 
@@ -40,7 +45,7 @@ BuildRequires: 	zlib-devel, bzip2-devel
 BuildRequires:  openssl-devel
 BuildRequires:  libelf-devel
 BuildRequires:  python3-devel, python3-rpm-macros
-BuildRequires:  pcre-devel
+BuildRequires:  pcre2-devel
 BuildRequires:  gnutls-devel
 BuildRequires:  desktop-file-utils, automake, libtool
 BuildRequires:  bison, flex
@@ -57,6 +62,7 @@ BuildRequires:	qt5-qtbase-devel
 BuildRequires:	qt5-linguist
 BuildRequires:	qt5-qtmultimedia-devel
 BuildRequires:	qt5-qtsvg-devel
+BuildRequires:	asciidoctor
 
 Requires:	%{name}-cli = %{version}-%{release}
 Requires:	usermode >= 1.37
@@ -107,7 +113,7 @@ and plugins.
 
 
 %prep
-%autosetup -S git
+%autosetup -p1
 
 
 %build
@@ -150,9 +156,8 @@ export PATH="$PATH:/usr/kerberos/bin"
 mkdir -p %{buildroot}%{python3_sitelib}
 install -m 644 tools/wireshark_be.py tools/wireshark_gen.py  %{buildroot}%{python3_sitelib}
 
-desktop-file-validate %{buildroot}%{_datadir}/applications/wireshark.desktop
+desktop-file-validate %{buildroot}%{_datadir}/applications/org.wireshark.Wireshark.desktop
 mkdir -p %{buildroot}/%{_datadir}/pixmaps
-install -m 644 image/wsicon48.png %{buildroot}/%{_datadir}/pixmaps/wireshark.png
 
 #install devel files (inspired by debian/wireshark-dev.header-files)
 install -d -m 0755  %{buildroot}%{_includedir}/wireshark
@@ -168,16 +173,15 @@ mkdir -p "${IDIR}/wsutil"
 mkdir -p %{buildroot}%{_udevrulesdir}
 install -m 644 %{_vpath_builddir}/config.h epan/register.h "${IDIR}/"
 install -m 644 cfile.h file.h           "${IDIR}/"
-install -m 644 ws_symbol_export.h       "${IDIR}/"
 install -m 644 epan/*.h                 "${IDIR}/epan/"
 install -m 644 epan/crypt/*.h           "${IDIR}/epan/crypt"
 install -m 644 epan/ftypes/*.h          "${IDIR}/epan/ftypes"
 install -m 644 epan/dfilter/*.h         "${IDIR}/epan/dfilter"
 install -m 644 epan/dissectors/*.h      "${IDIR}/epan/dissectors"
-install -m 644 epan/wmem/*.h            "${IDIR}/epan/wmem"
 install -m 644 wiretap/*.h              "${IDIR}/wiretap"
 install -m 644 wsutil/*.h               "${IDIR}/wsutil"
-install -m 644 ws_diag_control.h        "${IDIR}/"
+install -m 644 include/ws_symbol_export.h    "${IDIR}/"
+install -m 644 include/ws_diag_control.h    "${IDIR}/"
 install -m 644 %{SOURCE4}               %{buildroot}%{_udevrulesdir}
 
 # install support files for usermode, gnome and kde
@@ -194,10 +198,6 @@ ln -s consolehelper %{buildroot}%{_bindir}/wireshark
 # Remove idl2wrs
 #rm -f %{buildroot}%{_sbindir}/idl2wrs
 
-mkdir -p html
-cp -f %{buildroot}%{_datadir}/doc/%{name}/* ./html/
-rm -rf %{buildroot}%{_datadir}/doc/%{name}
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -216,11 +216,10 @@ fi
 
 
 %files
-%{_datadir}/appdata/wireshark.appdata.xml
-%{_datadir}/applications/*.desktop
+%{_datadir}/applications/org.wireshark.Wireshark.desktop
+%{_datadir}/metainfo/*.xml
+%{_datadir}/mime/packages/*.xml
 %{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/mime/packages/wireshark.xml
-%{_datadir}/pixmaps/wireshark.png
 %{_bindir}/wireshark
 %{_sbindir}/wireshark
 %config(noreplace) %{_sysconfdir}/security/console.apps/wireshark
@@ -247,34 +246,8 @@ fi
 %{_libdir}/lib*.so.*
 %{_libdir}/wireshark
 %exclude %{_libdir}/wireshark/cmake
-
 %dir %{_datadir}/%{name}
-%if %{with lua}
-%config(noreplace) %{_datadir}/%{name}/init.lua
-%{_datadir}/%{name}/console.lua
-%{_datadir}/%{name}/dtd_gen.lua
-%endif
-%{_datadir}/%{name}/AUTHORS-SHORT
-%{_datadir}/%{name}/COPYING
-%{_datadir}/%{name}/*.html
-%{_datadir}/%{name}/*.css
-%{_datadir}/%{name}/cfilters
-%{_datadir}/%{name}/colorfilters
-%{_datadir}/%{name}/dfilter_macros
-%{_datadir}/%{name}/dfilters
-%{_datadir}/%{name}/diameter
-%{_datadir}/%{name}/dtds
-%{_datadir}/%{name}/enterprises.tsv
-#{_datadir}/%{name}/help
-%{_datadir}/%{name}/manuf
-%{_datadir}/%{name}/pdml2html.xsl
-%{_datadir}/%{name}/profiles
-%{_datadir}/%{name}/radius
-%{_datadir}/%{name}/services
-%{_datadir}/%{name}/smi_modules
-%{_datadir}/%{name}/tpncp
-%{_datadir}/%{name}/wimaxasncp
-%{_datadir}/%{name}/wka
+%{_datadir}/%{name}/*
 %exclude %{_mandir}/man1/wireshark.*
 %{_mandir}/man*/*
 
@@ -287,6 +260,9 @@ fi
 
 
 %changelog
+* Sat Nov 05 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.0.1-1
+- new upstream release.
+
 * Fri Jul 30 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.4.7-1
 - new upstream release.