Browse code

Added logic to not replace cron configurations in upgrade scenario

Change-Id: Iae5930954f3606b85cece8783a089c4291b3d985
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/1260
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: suezzelur <anishs@vmware.com>

dthaluru authored on 2016/08/05 23:13:53
Showing 1 changed files
... ...
@@ -1,7 +1,7 @@
1 1
 Summary:	Cron Daemon
2 2
 Name:		cronie
3 3
 Version:	1.5.0
4
-Release:	9%{?dist}
4
+Release:	10%{?dist}
5 5
 License:	GPLv2+ and MIT and BSD and ISC
6 6
 URL:		https://fedorahosted.org/cronie
7 7
 Source0:	https://fedorahosted.org/releases/c/r/cronie/%{name}-%{version}.tar.gz
... ...
@@ -81,7 +81,7 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
81 81
 %files
82 82
 %defattr(-,root,root)
83 83
 %{_lib}/systemd/system/cron.service
84
-%{_sysconfdir}/pam.d/*
84
+%config(noreplace) %{_sysconfdir}/pam.d/*
85 85
 %{_bindir}/*
86 86
 %{_sbindir}/*
87 87
 %{_mandir}/man1/*
... ...
@@ -94,16 +94,18 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
94 94
 %dir %{_sysconfdir}/cron.daily
95 95
 %dir %{_sysconfdir}/cron.weekly
96 96
 %dir %{_sysconfdir}/cron.monthly
97
-%{_sysconfdir}/anacrontab
98
-%{_sysconfdir}/cron.d/*
99
-%{_sysconfdir}/cron.deny
97
+%config(noreplace) %{_sysconfdir}/anacrontab
98
+%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/cron.d/*
99
+%config(noreplace) %{_sysconfdir}/cron.deny
100 100
 %{_sysconfdir}/cron.hourly/0anacron
101
-%{_sysconfdir}/sysconfig/crond
101
+%config(noreplace) %{_sysconfdir}/sysconfig/crond
102 102
 %{_libdir}/systemd/system/crond.service
103 103
 /var/spool/anacron/cron.daily
104 104
 /var/spool/anacron/cron.monthly
105 105
 /var/spool/anacron/cron.weekly
106 106
 %changelog
107
+*   Thu Aug 4 2016 Divya Thaluru <dthaluru@vmware.com>  1.5.0-10
108
+-   Added logic to not replace conf files in upgrade scenario
107 109
 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.5.0-9
108 110
 -	GA - Bump release of all rpms
109 111
 *       Tue May 3 2016 Divya Thaluru <dthaluru@vmware.com>  1.5.0-8