Browse code

apache-tomcat : Mark configuration files as config(noreplace) (git issue 776)

Change-Id: I5a3103d73938f1348a6eaf0077fcc27d5fd3fb43
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/5165
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Sharath George

Xiaolin Li authored on 2018/05/24 04:12:22
Showing 1 changed files
... ...
@@ -1,7 +1,7 @@
1 1
 Summary:        Apache Tomcat
2 2
 Name:           apache-tomcat
3 3
 Version:        8.5.31
4
-Release:        1%{?dist}
4
+Release:        2%{?dist}
5 5
 License:        Apache
6 6
 URL:            http://tomcat.apache.org
7 7
 Group:          Applications/System
... ...
@@ -83,7 +83,16 @@ rm -rf %{buildroot}/*
83 83
 %dir %{_logsdir}
84 84
 %dir %{_tempdir}
85 85
 %{_bindir}/*
86
-%{_confdir}/*
86
+%config(noreplace) %{_confdir}/catalina.policy
87
+%config(noreplace) %{_confdir}/catalina.properties
88
+%config(noreplace) %{_confdir}/context.xml
89
+%config(noreplace) %{_confdir}/jaspic-providers.xml
90
+%config(noreplace) %{_confdir}/jaspic-providers.xsd
91
+%config(noreplace) %{_confdir}/logging.properties
92
+%config(noreplace) %{_confdir}/server.xml
93
+%config(noreplace) %{_confdir}/tomcat-users.xml
94
+%config(noreplace) %{_confdir}/tomcat-users.xsd
95
+%config(noreplace) %{_confdir}/web.xml
87 96
 %{_libdir}/*
88 97
 %{_webappsdir}/*
89 98
 %{_datadir}/java/tomcat/*.jar
... ...
@@ -92,6 +101,8 @@ rm -rf %{buildroot}/*
92 92
 %{_logsdir}/catalina.out
93 93
 
94 94
 %changelog
95
+*   Thu May 17 2018 Xiaolin Li <xiaolinl@vmware.com> 8.5.31-2
96
+-   Mark configuration files as config(noreplace)
95 97
 *   Mon May 07 2018 Xiaolin Li <xiaolinl@vmware.com> 8.5.31-1
96 98
 -   Upgraded to version 8.5.31
97 99
 *   Mon Apr 30 2018 Xiaolin Li <xiaolinl@vmware.com> 8.5.30-1