Skip to content

Loading…

Update the spec file to mark config files as such. #905

Merged
merged 1 commit into from

2 participants

@jonludlam
The Xapi Project member

Signed-off-by: Jon Ludlam jonathan.ludlam@eu.citrix.com

Conflicts:

xapi.spec.in
@jonludlam jonludlam Update the spec file to mark config files as such.
Signed-off-by: Jon Ludlam <jonathan.ludlam@eu.citrix.com>

Conflicts:

	xapi.spec.in
a2daafb
@xen-git
The Xapi Project member

jonludlam/xen-api@a2daafbxapi-project/xen-api@866c8c1: Build succeeded. Can merge pull request.

Jira ticket CA-92950

@jonludlam
The Xapi Project member

@xen-git Approved-lcm

@xen-git xen-git merged commit a2daafb into xapi-project:tampa-lcm
@xen-git
The Xapi Project member

jonludlam/xen-api@a2daafbxapi-project/xen-api@866c8c1: Build succeeded. Pull request merged.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Oct 25, 2012
  1. @jonludlam

    Update the spec file to mark config files as such.

    jonludlam committed
    Signed-off-by: Jon Ludlam <jonathan.ludlam@eu.citrix.com>
    
    Conflicts:
    
    	xapi.spec.in
This page is out of date. Refresh to see the latest.
Showing with 10 additions and 10 deletions.
  1. +10 −10 xapi.spec.in
View
20 xapi.spec.in
@@ -149,7 +149,7 @@ rm -rf $RPM_BUILD_ROOT
%files core
%defattr(-,root,root,-)
@OPTDIR@/bin/xapi
-/etc/xapi.conf
+%config(noreplace) /etc/xapi.conf
/etc/logrotate.d/audit
/etc/logrotate.d/v6d
/etc/logrotate.d/xapi
@@ -161,8 +161,8 @@ rm -rf $RPM_BUILD_ROOT
/etc/rc.d/init.d/xapissl
/etc/rc.d/init.d/xenservices
/etc/rc.d/init.d/genptoken
-/etc/sysconfig/perfmon
-/etc/sysconfig/xapi
+%config(noreplace) /etc/sysconfig/perfmon
+%config(noreplace) /etc/sysconfig/xapi
/etc/xapi.d/base-path
/etc/xapi.d/plugins/DRAC.py
/etc/xapi.d/plugins/DRAC.pyo
@@ -183,11 +183,11 @@ rm -rf $RPM_BUILD_ROOT
/etc/xapi.d/plugins/wlan.pyo
/etc/xapi.d/plugins/wlan.pyc
/etc/xapi.d/plugins/iovirt
-/etc/xensource/db.conf
-/etc/xensource/db.conf.rio
+%config(noreplace) /etc/xensource/db.conf
+%config(noreplace) /etc/xensource/db.conf.rio
/etc/xensource/master.d/01-example
/etc/xensource/master.d/03-mpathalert-daemon
-/etc/xensource/pool.conf
+%config(noreplace) /etc/xensource/pool.conf
@OPTDIR@/bin/fix_firewall.sh
@OPTDIR@/bin/list_domains
@OPTDIR@/bin/mpathalert
@@ -259,7 +259,7 @@ rm -rf $RPM_BUILD_ROOT
@OPTDIR@/libexec/shell.pyc
@OPTDIR@/libexec/shutdown
@OPTDIR@/libexec/sparse_dd
-/etc/sparse_dd.conf
+%config(noreplace) /etc/sparse_dd.conf
@OPTDIR@/libexec/update-mh-info
@OPTDIR@/libexec/upload-wrapper
@OPTDIR@/libexec/vncterm-wrapper
@@ -296,13 +296,13 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,-)
@OPTDIR@/libexec/squeezed
/etc/rc.d/init.d/squeezed
-/etc/squeezed.conf
+%config(noreplace) /etc/squeezed.conf
%files xenopsd
%defattr(-,root,root,-)
@OPTDIR@/libexec/xenopsd
/etc/rc.d/init.d/xenopsd
-/etc/xenopsd.conf
+%config(noreplace) /etc/xenopsd.conf
@OPTDIR@/bin/xn
/usr/bin/xn
/etc/xensource/bugtool/xenopsd.xml
@@ -325,7 +325,7 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,-)
@OPTDIR@/libexec/xcp-rrdd
/etc/rc.d/init.d/xcp-rrdd
-/etc/xcp-rrdd.conf
+%config(noreplace) /etc/xcp-rrdd.conf
/usr/lib/python2.4/site-packages/rrdd.py
/usr/lib/python2.4/site-packages/rrdd.pyc
/usr/lib/python2.4/site-packages/rrdd.pyo
Something went wrong with that request. Please try again.