fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-02 11:10:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

contrib/rpm: merge branch 'th/contrib-rpm-fixes'

Browse source 
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/850
This commit is contained in:
Thomas Haller 2021-05-12 13:36:50 +02:00
commit 18ca3803b5
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -447,7 +447,7 @@ This package contains NetworkManager support for PPP.
%package libnm
Summary: Libraries for adding NetworkManager support to applications.
Group: Development/Libraries
Conflicts: NetworkManager-glib < %{epoch}:%{version}-%{release}
Conflicts: NetworkManager-glib < 1:1.31.0
License: LGPLv2+
%description libnm
@ -515,7 +515,7 @@ Summary: NetworkManager dispatcher file for advanced routing rules
Group: System Environment/Base
BuildArch: noarch
Provides: %{name}-config-routing-rules = %{epoch}:%{version}-%{release}
Obsoletes: %{name}-config-routing-rules < %{epoch}:%{version}-%{release}
Obsoletes: %{name}-config-routing-rules < 1:1.31.0
%description dispatcher-routing-rules
This adds a NetworkManager dispatcher file to support networking
@ -977,6 +977,7 @@ fi
%dir %{_sysconfdir}/%{name}/dnsmasq-shared.d
%dir %{_sysconfdir}/%{name}/system-connections
%config(noreplace) %{_sysconfdir}/%{name}/NetworkManager.conf
%ghost %{_sysconfdir}/%{name}/VPN
%{_bindir}/nm-online
%{_libexecdir}/nm-ifup
%ghost %attr(755, root, root) %{_sbindir}/ifup