[packages/wireshark] - updated to 3.2.4 (new sonames) - fixed data packaging

qboosh qboosh at pld-linux.org
Sun Jun 21 09:03:16 CEST 2020 

commit c0f528478d4e9c7ffa8740edc3f7693d385fb218
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Jun 21 09:04:22 2020 +0200

    - updated to 3.2.4 (new sonames)
    - fixed data packaging

 wireshark.spec | 145 +++++++++++++++++++++++----------------------------------
 1 file changed, 59 insertions(+), 86 deletions(-)
---
diff --git a/wireshark.spec b/wireshark.spec
index 6a39163..b753243 100644
--- a/wireshark.spec
+++ b/wireshark.spec
@@ -1,22 +1,6 @@
 # TODO
 # - use policykit to gain root
 # - use %caps when rpm supports it: %attr(750,root,wireshark) %caps(cap_net_raw,cap_net_admin=eip) %{_sbindir}/dumpcap
-# - unpackaged files (datadir ?):
-# warning: Installed (but unpackaged) file(s) found:
-#        /usr/lib64/wireshark/cmake/FindGLIB2.cmake
-#        /usr/lib64/wireshark/cmake/FindWSWinLibs.cmake
-#        /usr/lib64/wireshark/cmake/LocatePythonModule.cmake
-#        /usr/lib64/wireshark/cmake/UseAsn2Wrs.cmake
-#        /usr/lib64/wireshark/cmake/UseMakePluginReg.cmake
-#        /usr/lib64/wireshark/cmake/WiresharkConfig.cmake
-#        /usr/lib64/wireshark/cmake/WiresharkConfigVersion.cmake
-#        /usr/lib64/wireshark/cmake/WiresharkTargets-pld.cmake
-#        /usr/lib64/wireshark/cmake/WiresharkTargets.cmake
-#        /usr/share/AUTHORS-SHORT
-#        /usr/share/COPYING
-#        /usr/share/androiddump.html
-#        /usr/share/asn2deb.html
-#	(...)
 #
 # Conditional build:
 %bcond_without	kerberos5	# Kerberos V support
@@ -30,26 +14,26 @@ Summary(pt_BR.UTF-8):	Analisador de tráfego de rede
 Summary(ru.UTF-8):	Анализатор сетевого траффика
 Summary(uk.UTF-8):	Аналізатор мережевого трафіку
 Name:		wireshark
-Version:	3.0.1
+Version:	3.2.4
 Release:	1
 License:	GPL v2+
 Group:		Networking/Utilities
 Source0:	https://www.wireshark.org/download/src/%{name}-%{version}.tar.xz
-# Source0-md5:	370a113e1c8ec240c4621cfb5abb0c52
+# Source0-md5:	4bbee1bdd5b88343733590fabfffddf3
 Patch0:		cmake.patch
 URL:		https://www.wireshark.org/
-BuildRequires:	GeoIP-devel
-BuildRequires:	asciidoc
 BuildRequires:	bcg729-devel
 BuildRequires:	bison
-BuildRequires:	cmake
+BuildRequires:	cmake >= 3.5
 BuildRequires:	c-ares-devel >= 1.5.0
 BuildRequires:	doxygen
 BuildRequires:	flex
 BuildRequires:	gcc >= 5:3.2
+BuildRequires:	gettext-tools
 BuildRequires:	glib2-devel >= 1:2.32
 BuildRequires:	gnutls-devel >= 3.2.0
 %{?with_kerberos5:BuildRequires:	heimdal-devel}
+BuildRequires:	libbrotli-devel
 BuildRequires:	libcap-devel
 BuildRequires:	libgcrypt-devel >= 1.4.2
 BuildRequires:	libmaxminddb-devel
@@ -57,37 +41,45 @@ BuildRequires:	libnl-devel >= 3.2
 BuildRequires:	libpcap-devel >= 2:1.0.0-4
 BuildRequires:	libssh-devel >= 0.6.0
 BuildRequires:	libsmi-devel
-BuildRequires:	libstdc++-devel
+BuildRequires:	libstdc++-devel >= 6:4.7
 BuildRequires:	libtool >= 2:2.2.2
 BuildRequires:	libxml2-devel >= 2.0
 BuildRequires:	libxslt-progs
 BuildRequires:	lua52-devel
 BuildRequires:	lz4-devel
+BuildRequires:	minizip-devel
 %{?with_snmp:BuildRequires:	net-snmp-devel}
 BuildRequires:	nghttp2-devel
 BuildRequires:	perl-tools-pod
 BuildRequires:	pkgconfig >= 1:0.7
 BuildRequires:	python3 >= 1:3.4
 BuildRequires:	rpmbuild(macros) >= 1.527
+BuildRequires:	ruby-asciidoctor >= 1.5
 %{?with_gui:BuildRequires:	sbc-devel >= 1.0}
-%{?with_gui:BuildRequires:	speexdsp-devel}
 BuildRequires:	sed >= 4.0
+%{?with_gui:BuildRequires:	speexdsp-devel}
 BuildRequires:	snappy-devel
 BuildRequires:	spandsp-devel
+BuildRequires:	systemd-devel
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	w3m
 BuildRequires:	xz
+BuildRequires:	zstd-devel >= 1.0.0
 BuildRequires:	zlib-devel
 %if %{with gui}
 BuildRequires:	Qt5Core-devel >= 5.2
 BuildRequires:	Qt5Multimedia-devel >= 5.2
 BuildRequires:	Qt5PrintSupport-devel >= 5.2
+BuildRequires:	Qt5Svg-devel >= 5.2
 BuildRequires:	Qt5Widgets-devel >= 5.2
-BuildRequires:	libstdc++-devel >= 5
+BuildRequires:	libstdc++-devel >= 6:5
 BuildRequires:	qt5-build >= 5.2
 BuildRequires:	qt5-linguist >= 5.2
 %endif
+Requires(post,postun):	gtk-update-icon-cache
+Requires(post,postun):	shared-mime-info
 Requires:	gdk-pixbuf2 >= 2.26
+Requires:	hicolor-icon-theme
 Suggests:	xdg-utils
 Provides:	ethereal
 Provides:	ethereal-gnome
@@ -133,6 +125,7 @@ Wireshark - це аналізатор мережевого трафіку для
 Summary:	Network traffic and protocol analyzer - common files
 Summary(pl.UTF-8):	Analizator ruchu i protokołów sieciowych - wspólne pliki
 Group:		Networking
+Requires(post,postun):	/sbin/setcap
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	gnutls >= 3.1.10
 Requires:	libpcap >= 0.4
@@ -142,7 +135,6 @@ Provides:	group(wireshark)
 Provides:	wireshark-tools
 Obsoletes:	ethereal-common
 Obsoletes:	wireshark-tools
-Requires(post,postun):	/sbin/setcap
 
 %description common
 Wireshark is the name for powerful graphical network sniffer, traffic
@@ -268,61 +260,48 @@ Pliki nagłówkowe bibliotek Wiresharka.
 %patch0 -p1
 
 %build
-%cmake -G "Unix Makefiles" \
-  -DDISABLE_WERROR=ON \
-  -DBUILD_wireshark=ON \
-  -DENABLE_QT5=ON \
-  -DENABLE_LUA=ON \
-  -DBUILD_mmdbresolve=ON \
-  -DBUILD_randpktdump=ON \
-  -DBUILD_androiddump=ON \
-  -DBUILD_tfshark=OFF \
-  -DBUILD_corbaidl2wrs=ON \
-  -DBUILD_dcerpcidl2wrs=ON \
-  -DBUILD_xxx2deb=ON \
-  -DENABLE_SMI=ON \
-  -DENABLE_PORTAUDIO=ON \
-  -DENABLE_PLUGINS=ON \
-  -DENABLE_NETLINK=ON
+install -d build
+cd build
+%cmake .. \
+	-DBUILD_androiddump=ON \
+	-DBUILD_corbaidl2wrs=ON \
+	-DBUILD_dcerpcidl2wrs=ON \
+	-DBUILD_mmdbresolve=ON \
+	-DBUILD_randpktdump=ON \
+	-DBUILD_tfshark=OFF \
+	-DBUILD_wireshark=ON \
+	-DCMAKE_INSTALL_DATADIR:PATH=share/wireshark \
+	-DCMAKE_INSTALL_LIBDIR:PATH=%{_lib} \
+	-DDISABLE_WERROR=ON \
+	-DENABLE_LUA=ON \
+	-DENABLE_NETLINK=ON \
+	-DENABLE_PLUGINS=ON \
+	-DENABLE_PORTAUDIO=ON \
+	-DENABLE_QT5=ON \
+	-DENABLE_SMI=ON
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},%{_includedir}/wireshark}
 
-%{__make} install \
+%{__make} -C build install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-cp -p image/wsicon48.png $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
+# used by installed headers, but not installed by cmake
+cp -p build/config.h $RPM_BUILD_ROOT%{_includedir}/wireshark
 
-%{?with_gui:cp -p wireshark.desktop $RPM_BUILD_ROOT%{_desktopdir}/wireshark.desktop}
-
-# headers (from Fedora, inspired by debian/wireshark-dev.header-files)
-install -d $RPM_BUILD_ROOT%{_includedir}/wireshark/{epan/{crypt,ftypes,dfilter,dissectors,wmem},wiretap,wsutil}
-install config.h            $RPM_BUILD_ROOT%{_includedir}/wireshark
-install cfile.h file.h      $RPM_BUILD_ROOT%{_includedir}/wireshark
-install ws_diag_control.h   $RPM_BUILD_ROOT%{_includedir}/wireshark
-install ws_symbol_export.h  $RPM_BUILD_ROOT%{_includedir}/wireshark
-install epan/*.h            $RPM_BUILD_ROOT%{_includedir}/wireshark/epan
-install epan/crypt/*.h      $RPM_BUILD_ROOT%{_includedir}/wireshark/epan/crypt
-install epan/ftypes/*.h     $RPM_BUILD_ROOT%{_includedir}/wireshark/epan/ftypes
-install epan/dfilter/*.h    $RPM_BUILD_ROOT%{_includedir}/wireshark/epan/dfilter
-install epan/dissectors/*.h $RPM_BUILD_ROOT%{_includedir}/wireshark/epan/dissectors
-install epan/wmem/*.h       $RPM_BUILD_ROOT%{_includedir}/wireshark/epan/wmem
-install wiretap/*.h         $RPM_BUILD_ROOT%{_includedir}/wireshark/wiretap
-install wsutil/*.h          $RPM_BUILD_ROOT%{_includedir}/wireshark/wsutil
-
-# plugins *.la are useless - *.so are loaded through gmodule
-#%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/*/*/*.la
+%{__rm} $RPM_BUILD_ROOT%{_docdir}/*.html
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %pre
+%update_icon_cache hicolor
 %update_mime_database
 
 %postun
+%update_icon_cache hicolor
 %update_mime_database
 
 %pre	common
@@ -345,10 +324,9 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/wireshark
 %{_desktopdir}/wireshark.desktop
-#%{_datadir}/%{name}
+%{_datadir}/%{name}
 %{_datadir}/appdata/wireshark.appdata.xml
 %{_datadir}/mime/packages/wireshark.xml
-%{_pixmapsdir}/%{name}.png
 %{_iconsdir}/hicolor/16x16/apps/%{name}.png
 %{_iconsdir}/hicolor/16x16/mimetypes/application-%{name}-doc.png
 %{_iconsdir}/hicolor/24x24/apps/%{name}.png
@@ -370,13 +348,12 @@ fi
 %files common
 %defattr(644,root,root,755)
 %doc AUTHORS* ChangeLog NEWS README.md README.linux doc/README.*
-%dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/extcap
 %dir %{_libdir}/%{name}/plugins
-%dir %{_libdir}/%{name}/plugins/3.0
-%dir %{_libdir}/%{name}/plugins/3.0/codecs
-%dir %{_libdir}/%{name}/plugins/3.0/epan
-%dir %{_libdir}/%{name}/plugins/3.0/wiretap
+%dir %{_libdir}/%{name}/plugins/3.2
+%dir %{_libdir}/%{name}/plugins/3.2/codecs
+%dir %{_libdir}/%{name}/plugins/3.2/epan
+%dir %{_libdir}/%{name}/plugins/3.2/wiretap
 %attr(755,root,root) %{_libdir}/%{name}/extcap/androiddump
 %attr(755,root,root) %{_libdir}/%{name}/extcap/ciscodump
 %attr(755,root,root) %{_libdir}/%{name}/extcap/dpauxmon
@@ -384,12 +361,11 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/extcap/sshdump
 %attr(755,root,root) %{_libdir}/%{name}/extcap/sdjournal
 %attr(755,root,root) %{_libdir}/%{name}/extcap/udpdump
-%attr(755,root,root) %{_libdir}/%{name}/plugins/3.0/codecs/*.so
-%attr(755,root,root) %{_libdir}/%{name}/plugins/3.0/epan/*.so
-%attr(755,root,root) %{_libdir}/%{name}/plugins/3.0/wiretap/*.so
+%attr(755,root,root) %{_libdir}/%{name}/plugins/3.2/codecs/*.so
+%attr(755,root,root) %{_libdir}/%{name}/plugins/3.2/epan/*.so
+%attr(755,root,root) %{_libdir}/%{name}/plugins/3.2/wiretap/*.so
 %attr(755,root,root) %{_bindir}/capinfos
 %attr(755,root,root) %{_bindir}/captype
-#%attr(755,root,root) %{_bindir}/dftest
 %attr(750,root,wireshark) %{_bindir}/dumpcap
 %attr(755,root,root) %{_bindir}/editcap
 %attr(755,root,root) %{_bindir}/idl2wrs
@@ -400,20 +376,22 @@ fi
 %attr(755,root,root) %{_bindir}/reordercap
 %attr(755,root,root) %{_bindir}/sharkd
 %attr(755,root,root) %{_bindir}/text2pcap
-#%attr(755,root,root) %{_bindir}/tfshark
 %{_mandir}/man1/androiddump.1*
 %{_mandir}/man1/capinfos.1*
 %{_mandir}/man1/captype.1*
 %{_mandir}/man1/ciscodump.1*
 %{_mandir}/man1/dftest.1*
+%{_mandir}/man1/dpauxmon.1*
 %{_mandir}/man1/dumpcap.1*
 %{_mandir}/man1/editcap.1*
+%{_mandir}/man1/idl2wrs.1*
 %{_mandir}/man1/mergecap.1*
 %{_mandir}/man1/mmdbresolve.1*
 %{_mandir}/man1/rawshark.1*
 %{_mandir}/man1/randpkt.1*
 %{_mandir}/man1/randpktdump.1*
 %{_mandir}/man1/reordercap.1*
+%{_mandir}/man1/sdjournal.1*
 %{_mandir}/man1/sshdump.1*
 %{_mandir}/man1/text2pcap.1*
 %{_mandir}/man1/udpdump.1*
@@ -427,25 +405,20 @@ fi
 
 %files libs
 %defattr(644,root,root,755)
-#%doc wiretap/README*
 %attr(755,root,root) %{_libdir}/libwireshark.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libwireshark.so.12
+%attr(755,root,root) %ghost %{_libdir}/libwireshark.so.13
 %attr(755,root,root) %{_libdir}/libwiretap.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libwiretap.so.9
-%attr(755,root,root) %{_libdir}/libwscodecs.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libwscodecs.so.2
+%attr(755,root,root) %ghost %{_libdir}/libwiretap.so.10
 %attr(755,root,root) %{_libdir}/libwsutil.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libwsutil.so.10
+%attr(755,root,root) %ghost %{_libdir}/libwsutil.so.11
+%dir %{_libdir}/%{name}
 
 %files devel
 %defattr(644,root,root,755)
+%doc wiretap/{README,README.airmagnet}
 %attr(755,root,root) %{_libdir}/libwireshark.so
 %attr(755,root,root) %{_libdir}/libwiretap.so
-%attr(755,root,root) %{_libdir}/libwscodecs.so
 %attr(755,root,root) %{_libdir}/libwsutil.so
-#%{_libdir}/libwireshark.la
-#%{_libdir}/libwiretap.la
-#%{_libdir}/libwscodecs.la
-#%{_libdir}/libwsutil.la
 %{_includedir}/wireshark
 %{_pkgconfigdir}/wireshark.pc
+%{_libdir}/%{name}/cmake
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/wireshark.git/commitdiff/c0f528478d4e9c7ffa8740edc3f7693d385fb218

More information about the pld-cvs-commit mailing list