diff --git a/wireshark.changes b/wireshark.changes index 7c2705f..d0aca54 100644 --- a/wireshark.changes +++ b/wireshark.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Apr 17 15:47:01 UTC 2019 - Robert Frohl + +- Added config.h again, which got lost during the wireshark 3 update. + ------------------------------------------------------------------- Tue Apr 9 07:38:06 UTC 2019 - Robert Frohl diff --git a/wireshark.spec b/wireshark.spec index 6c1fa3c..49244e6 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -151,7 +151,8 @@ Group: Productivity/Networking/Diagnostic Requires: %{name} = %{version} Provides: %{name}-ui = %{version} # 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 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 %build - -%cmake +%cmake -DCMAKE_INSTALL_LIBDIR='lib64/' %cmake_build %install @@ -199,6 +199,7 @@ mkdir -p "${IDIR}/epan/wmem" mkdir -p "${IDIR}/wiretap" mkdir -p "${IDIR}/wsutil" install -m 644 *.h "${IDIR}/" +install -m 644 build/config.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" @@ -273,6 +274,7 @@ exit 0 %files devel %{_includedir}/wireshark +%{_includedir}/wireshark/config.h %{_libdir}/lib*.so %{_libdir}/pkgconfig/wireshark.pc