pool/wireshark
SHA256
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 701360 from home:rfrohl:branches:network:utilities

Browse Source 
should finally fix libvirt build problem

OBS-URL: https://build.opensuse.org/request/show/701360
OBS-URL: https://build.opensuse.org/package/show/network:utilities/wireshark?expand=0&rev=273
This commit is contained in:
Robert Frohl 2019-05-07 16:37:06 +00:00 committed by Git OBS Bridge
parent 5c148bec76
commit 843cfb1c8a
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wireshark.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Apr 17 15:47:01 UTC 2019 - Robert Frohl <rfrohl@suse.com>
- Added config.h again, which got lost during the wireshark 3 update.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Apr 9 07:38:06 UTC 2019 - Robert Frohl <rfrohl@suse.com> Tue Apr 9 07:38:06 UTC 2019 - Robert Frohl <rfrohl@suse.com>

8
wireshark.spec
View File

@ -151,7 +151,8 @@ Group: Productivity/Networking/Diagnostic
Requires: %{name} = %{version} Requires: %{name} = %{version}
Provides: %{name}-ui = %{version} Provides: %{name}-ui = %{version}
# gtk is the deprecated ui so ensure its uninstall # gtk is the deprecated ui so ensure its uninstall
Obsoletes: %{name}-ui-gtk Provides: %{name}-ui-gtk = %{version}
Obsoletes: %{name}-ui-gtk < %{version}
%description ui-qt %description ui-qt
This package contains the Qt based UI for Wireshark. This package contains the Qt based UI for Wireshark.
@ -166,8 +167,7 @@ echo "`grep %{name}-%{version}.tar.xz %{SOURCE2} | grep SHA256 | head -n1 | cut
sed -i 's/^Icon=wireshark.png$/Icon=wireshark/' wireshark*.desktop sed -i 's/^Icon=wireshark.png$/Icon=wireshark/' wireshark*.desktop
%build %build
%cmake -DCMAKE_INSTALL_LIBDIR='lib64/'
%cmake
%cmake_build %cmake_build
%install %install
@ -199,6 +199,7 @@ mkdir -p "${IDIR}/epan/wmem"
mkdir -p "${IDIR}/wiretap" mkdir -p "${IDIR}/wiretap"
mkdir -p "${IDIR}/wsutil" mkdir -p "${IDIR}/wsutil"
install -m 644 *.h "${IDIR}/" install -m 644 *.h "${IDIR}/"
install -m 644 build/config.h "${IDIR}/"
install -m 644 epan/*.h "${IDIR}/epan/" install -m 644 epan/*.h "${IDIR}/epan/"
install -m 644 epan/crypt/*.h "${IDIR}/epan/crypt" install -m 644 epan/crypt/*.h "${IDIR}/epan/crypt"
install -m 644 epan/ftypes/*.h "${IDIR}/epan/ftypes" install -m 644 epan/ftypes/*.h "${IDIR}/epan/ftypes"
@ -273,6 +274,7 @@ exit 0
%files devel %files devel
%{_includedir}/wireshark %{_includedir}/wireshark
%{_includedir}/wireshark/config.h
%{_libdir}/lib*.so %{_libdir}/lib*.so
%{_libdir}/pkgconfig/wireshark.pc %{_libdir}/pkgconfig/wireshark.pc