diff --git a/wireshark.changes b/wireshark.changes index c72fd15..826e6da 100644 --- a/wireshark.changes +++ b/wireshark.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Nov 29 15:05:49 UTC 2023 - Dominique Leuenberger + +- Install SDK using cmake --install --component Development instead + of manually copying. This brings back the .pc file and simplifies + the spec file. + ------------------------------------------------------------------- Fri Nov 24 09:40:38 UTC 2023 - Robert Frohl diff --git a/wireshark.spec b/wireshark.spec index 64c3673..e371b6f 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -197,7 +197,7 @@ echo "`grep %{name}-%{version}.tar.xz %{SOURCE2} | grep SHA256 | head -n1 | cut %install %cmake_install -find %{buildroot} -type f -name "*.la" -delete -print +cmake --install build --component Development --prefix %{buildroot}%{_prefix} # removing doc files that are not needed` rm %{buildroot}/usr/share/doc/wireshark/COPYING rm %{buildroot}/usr/share/doc/wireshark/README.xml-output @@ -207,27 +207,6 @@ rm %{buildroot}/usr/share/doc/wireshark/ws.css install -d -m 0755 %{buildroot}%{_sysconfdir} install -d -m 0755 %{buildroot}%{_mandir}/man1/ -# -devel -install -d -m 0755 %{buildroot}%{_includedir}/wireshark -IDIR="%{buildroot}%{_includedir}/wireshark" -mkdir -p "${IDIR}/epan" -mkdir -p "${IDIR}/epan/crypt" -mkdir -p "${IDIR}/epan/ftypes" -mkdir -p "${IDIR}/epan/dfilter" -mkdir -p "${IDIR}/epan/dissectors" -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" -install -m 644 epan/dfilter/*.h "${IDIR}/epan/dfilter" -install -m 644 epan/dissectors/*.h "${IDIR}/epan/dissectors" -install -m 644 wiretap/*.h "${IDIR}/wiretap" -install -m 644 wsutil/*.h "${IDIR}/wsutil" - # desktop file cp resources/freedesktop/%{org_name}.desktop %{buildroot}%{_datadir}/applications/%{org_name}-su.desktop sed -i -e 's|Name=Wireshark|Name=Wireshark - Super User Mode|g' %{buildroot}%{_datadir}/applications/%{org_name}-su.desktop @@ -286,11 +265,10 @@ exit 0 %{_libdir}/libwiretap.so.* %files devel -%{_includedir}/wireshark -%{_includedir}/wireshark/config.h +%{_includedir}/wireshark/ %{_libdir}/lib*.so -# XXX: pkgconfig missing -#{_libdir}/pkgconfig/wireshark.pc +%{_libdir}/pkgconfig/wireshark.pc +%{_libdir}/cmake/wireshark/ %files ui-qt %{_bindir}/wireshark