[NetworkManager/f21] Do not override configuration files on updates (rh #1153901)

[Jirka Klimes]

commit 5717faa588c8154fed4ccba33c1c2f47bd50624a
Author: Jiří Klimeš <jklimes at redhat.com>
Date:   Mon Oct 20 10:28:21 2014 +0200

    Do not override configuration files on updates (rh #1153901)
    
    Rather leave modified configuration files untouched and save the new files
    with .rpmnew suffix.
    
    http://stackoverflow.com/questions/14511334/rpm-upgrade-handling-of-config-files
    
    https://bugzilla.redhat.com/show_bug.cgi?id=1153901

 NetworkManager.spec |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/NetworkManager.spec b/NetworkManager.spec
index 1af5a26..026036d 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -583,12 +583,12 @@ fi
 %files config-connectivity-fedora
 %defattr(-,root,root,0755)
 %dir %{_sysconfdir}/%{name}/conf.d
-%config %{_sysconfdir}/%{name}/conf.d/20-connectivity-fedora.conf
+%config(noreplace) %{_sysconfdir}/%{name}/conf.d/20-connectivity-fedora.conf
 
 %files config-server
 %defattr(-,root,root,0755)
 %dir %{_sysconfdir}/%{name}/conf.d
-%config %{_sysconfdir}/%{name}/conf.d/00-server.conf
+%config(noreplace) %{_sysconfdir}/%{name}/conf.d/00-server.conf
 
 %if 0%{?with_nmtui}
 %files tui