[FIXED JENKINS-10037]

The rpm should create a new config with .rpmnew instead of rotating out existing configs. This is a fix for JENKINS-10037.
jenkinsci · Aug 9, 2011 · 469c6e9 · 469c6e9
1 parent b13ec46
commit 469c6e9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/changelog.html b/changelog.html
@@ -62,6 +62,9 @@
     Fixed a bug where SSH public key authentication for CLI wasn't working for username/password based security realm.
   <li class=rfe>
     Improved the speed of shutdown
+  <li class=rfe>
+    RPM package should honor user-modified configuration file better
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-10037">issue 10037</a>)
   <li class=rfe>
     OS X package now provides customizable commandline
     (<a href="https://github.com/jenkinsci/jenkins/pull/195">pull request 195</a>)

diff --git a/rpm/SPECS/jenkins.spec b/rpm/SPECS/jenkins.spec
@@ -134,8 +134,8 @@ exit 0
 %attr(0755,jenkins,jenkins) %dir %{workdir}
 %attr(0750,jenkins,jenkins) /var/log/jenkins
 %config /etc/logrotate.d/%{name}
-%config /etc/init.d/%{name}
-%config /etc/sysconfig/%{name}
+%config(noreplace) /etc/init.d/%{name}
+%config(noreplace) /etc/sysconfig/%{name}
 /etc/yum.repos.d/jenkins.repo
 /usr/sbin/rc%{name}