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

Accepting request 1129841 from home:dimstar:Factory

Browse Source 
- Install SDK using cmake --install --component Development instead
  of manually copying. This brings back the .pc file and simplifies
  the spec file.

OBS-URL: https://build.opensuse.org/request/show/1129841
OBS-URL: https://build.opensuse.org/package/show/network:utilities/wireshark?expand=0&rev=421
This commit is contained in:
Robert Frohl 2023-11-29 15:31:49 +00:00 committed by Git OBS Bridge
parent 99ac6e83a5
commit 978a7d4687
2 changed files with 11 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
wireshark.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Nov 29 15:05:49 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org>
- 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 <rfrohl@suse.com> Fri Nov 24 09:40:38 UTC 2023 - Robert Frohl <rfrohl@suse.com>

30
wireshark.spec
View File

@ -197,7 +197,7 @@ echo "`grep %{name}-%{version}.tar.xz %{SOURCE2} | grep SHA256 | head -n1 | cut
%install %install
%cmake_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` # removing doc files that are not needed`
rm %{buildroot}/usr/share/doc/wireshark/COPYING rm %{buildroot}/usr/share/doc/wireshark/COPYING
rm %{buildroot}/usr/share/doc/wireshark/README.xml-output 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}%{_sysconfdir}
install -d -m 0755 %{buildroot}%{_mandir}/man1/ 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 # desktop file
cp resources/freedesktop/%{org_name}.desktop %{buildroot}%{_datadir}/applications/%{org_name}-su.desktop 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 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.* %{_libdir}/libwiretap.so.*
%files devel %files devel
%{_includedir}/wireshark %{_includedir}/wireshark/
%{_includedir}/wireshark/config.h
%{_libdir}/lib*.so %{_libdir}/lib*.so
# XXX: pkgconfig missing %{_libdir}/pkgconfig/wireshark.pc
#{_libdir}/pkgconfig/wireshark.pc %{_libdir}/cmake/wireshark/
%files ui-qt %files ui-qt
%{_bindir}/wireshark %{_bindir}/wireshark