fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-27 05:30:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

spec: fix nmplugindir

Browse source 
When dist_version is defined in meson, NM installs plugins to a
directory called `NetworkManager-${dist_version}`. If the dist version
contains a `~`, like `1.56~rc1`, defining nmplugindir with
`%{version_no_tilde}` makes it `NetworkManager-1.56-rc1`, causing
rpmbuild errors due to the mismatch.

Fix it by defining nmplugindir with `%{version}` instead.

Fixes: d975389bcd ('spec: use versioning scheme with ~dev and ~rc suffixes')
(cherry picked from commit 9ebc8aa480)
This commit is contained in:
Íñigo Huguet 2026-01-09 08:32:58 +01:00
parent 85c5ba18ee
commit d41cc08e78
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
contrib/fedora/rpm/NetworkManager.spec
View file

@ -27,7 +27,7 @@
%global obsoletes_ifcfg_rh 1:1.36.2
%global nmlibdir %{_prefix}/lib/%{name}
%global nmplugindir %{_libdir}/%{name}/%{version_no_tilde}-%{release}
%global nmplugindir %{_libdir}/%{name}/%{version}-%{release}
%global _hardened_build 1