osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

packaging: Let SUSE build with /usr prefix 

There's a couple places where /usr/local is hardcoded in the
spec file that need to be replaced with %{_prefix} in order for
RPMs to build correctly on OpenSUSE with prefixes other than
/usr/local
This commit is contained in:
John Thacker 2022-01-07 00:28:55 -05:00 committed by A Wireshark GitLab Utility
parent cac5c086ed
commit 7027242c27
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packaging/rpm/wireshark.spec.in
View File

@ -386,7 +386,9 @@ cd -
# SUSE's packaging conventions
# (https://en.opensuse.org/openSUSE:Packaging_Conventions_RPM_Macros#.25suse_update_desktop_file)
# require this:
install -Dm 0644 %{buildroot}/usr/local/share/applications/org.wireshark.Wireshark.desktop %{buildroot}/usr/share/applications/org.wireshark.Wireshark.desktop
%if "%{_prefix}" != "/usr"
install -Dm 0644 %{buildroot}%{_prefix}/share/applications/org.wireshark.Wireshark.desktop %{buildroot}/usr/share/applications/org.wireshark.Wireshark.desktop
%endif
%suse_update_desktop_file org.wireshark.Wireshark
%else
# Fedora's packaging guidelines (https://fedoraproject.org/wiki/Packaging:Guidelines)
@ -422,7 +424,7 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%if 0%{?suse_version}
# Before packing, we need to restore the bindir to the wireshark one
%define _bindir /usr/local/bin
%define _bindir %{_prefix}/bin
%endif
%defattr(-,root,root)