From 5d66f91de812af323668a7c5263c85f1a1fb988f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= Date: Tue, 21 Oct 2014 14:56:30 +0200 Subject: [PATCH] contrib/rpm: 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 --- contrib/fedora/rpm/NetworkManager.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index 4ee0a3eb4d..8f82581588 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -627,12 +627,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