From ffa70203fdd6434712ccf7ad42ea76a6abc46a87 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Sun, 7 Jun 2015 15:58:11 +0200 Subject: [PATCH] contrib/rpm: update spec file to install configuration snippets in "/usr/lib/NetworkManager/conf.d" Don't move "10-ibft-plugin.conf", because we need it to be read *after* "NetworkManager.conf". Many users might have an old "NetworkManager.conf" file that contains "plugin=ifcfg-rh". --- contrib/fedora/rpm/NetworkManager.spec | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index c026cef08f..aa091e04f1 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -445,9 +445,9 @@ make install DESTDIR=$RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.d mkdir -p $RPM_BUILD_ROOT%{nmlibdir}/conf.d -%{__cp} %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.d +%{__cp} %{SOURCE2} $RPM_BUILD_ROOT%{nmlibdir}/conf.d/ %{__cp} %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.d -%{__cp} %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.d +%{__cp} %{SOURCE4} $RPM_BUILD_ROOT%{nmlibdir}/conf.d/ # create a VPN directory %{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/NetworkManager/VPN @@ -664,15 +664,15 @@ fi %files config-connectivity-fedora %defattr(-,root,root,0755) -%dir %{_sysconfdir}/%{name} -%dir %{_sysconfdir}/%{name}/conf.d -%config(noreplace) %{_sysconfdir}/%{name}/conf.d/20-connectivity-fedora.conf +%dir %{nmlibdir} +%dir %{nmlibdir}/conf.d +%{nmlibdir}/conf.d/20-connectivity-fedora.conf %files config-server %defattr(-,root,root,0755) -%dir %{_sysconfdir}/%{name} -%dir %{_sysconfdir}/%{name}/conf.d -%config(noreplace) %{_sysconfdir}/%{name}/conf.d/00-server.conf +%dir %{nmlibdir} +%dir %{nmlibdir}/conf.d +%{nmlibdir}/conf.d/00-server.conf %if 0%{?with_nmtui} %files tui