From cb9abc846727259534b7e108c57cb97a39971660 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= Date: Mon, 20 Oct 2014 10:28:21 +0200 Subject: [PATCH] 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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/NetworkManager.spec b/NetworkManager.spec index dfce894..cfc2271 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -601,12 +601,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 @@ -617,7 +617,7 @@ fi %endif %changelog -* Fri Oct 17 2014 Dan Williams - 0.9.9.0-45.git20131003 +* Fri Oct 17 2014 Dan Williams - 0.9.9.0-46.git20131003 - ifcfg-rh: backport DHCP_SEND_HOSTNAME=no/yes option (rh #1001529) * Thu Sep 25 2014 Lubomir Rintel - 0.9.9.0-45.git20131003