diff options
| author | Thomas Haller <thaller@redhat.com> | 2021-05-12 13:36:50 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2021-05-12 13:36:50 +0200 |
| commit | 18ca3803b5bb58162acfcee66f7ac7fe2c6b4f05 (patch) | |
| tree | 5828fa809e117acbba77517791015304688c10f5 | |
| parent | d784fdb9d9100cd28e509f81b13c6caf5765ec2c (diff) | |
| parent | af40a14556de25d412e233c98689597af0ff8258 (diff) | |
| download | NetworkManager-18ca3803b5bb58162acfcee66f7ac7fe2c6b4f05.tar.gz | |
contrib/rpm: merge branch 'th/contrib-rpm-fixes'
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/850
| -rw-r--r-- | contrib/fedora/rpm/NetworkManager.spec | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index e75f26001b..ba4a14e9a8 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -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 |