From a081bd90d643a9f221d1827e38b96dadb23eaba8 Mon Sep 17 00:00:00 2001 From: Ryan Rathsam Date: Fri, 30 Jun 2017 15:30:56 -0400 Subject: [PATCH] Updating the supremm spec file - Updated the definition of modules.d/supremm.json so that the file is pulled from the correct location. - Explicitly defined the other *supremm*.json locations for config(noreplace) flagging as opposed to the more general /xdmod/*.d/supremm*.json ( which included modules.d/supremm.json, not what we wanted ). - Testing consisted of building the rpm with the latest docker image and then executing the following commands: - cd ~/rpmbuild/RPMS/noarch - rpm -qp --queryformat '[%{FILENAMES} %{FILEFLAGS} \n]' xdmod-supremm-7.0.0-1.0.el7.centos.noarch.rpm | grep -E "supremm.*\.json" | grep /etc/xdmod - ex. output: /etc/xdmod/datawarehouse.d/supremm.json 17 - if the number is 17 then it's a config / noreplace - if the number is 0 then it's just a regular file. - you can find all the file flags and their values ( it's a bitflag ) @ http://refspecs.linuxbase.org/LSB_4.1.0/LSB-Core-generic/LSB-Core-generic/pkgformat.html --- xdmod-supremm.spec.in | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/xdmod-supremm.spec.in b/xdmod-supremm.spec.in index 3b7342be..efb44302 100644 --- a/xdmod-supremm.spec.in +++ b/xdmod-supremm.spec.in @@ -41,11 +41,15 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/xdmod/ %{_datadir}/xdmod/ %{_docdir}/%{name}-%{version}__PRERELEASE__/ -%{_sysconfdir}/modules.d/supremm.json +%{_sysconfdir}/xdmod/modules.d/supremm.json %config(noreplace) %{_datadir}/xdmod/etl/js/config/supremm/etl.profile.js %config(noreplace) %{_sysconfdir}/xdmod/*.d/supremm.ini -%config(noreplace) %{_sysconfdir}/xdmod/*.d/supremm*.json +%config(noreplace) %{_sysconfdir}/xdmod/datawarehouse.d/supremm*.json +%config(noreplace) %{_sysconfdir}/xdmod/internal_dashboard.d/supremm*.json +%config(noreplace) %{_sysconfdir}/xdmod/roles.d/supremm*.json +%config(noreplace) %{_sysconfdir}/xdmod/setup.d/supremm*.json +%config(noreplace) %{_sysconfdir}/xdmod/rest.d/supremm*.json %config(noreplace) %{_sysconfdir}/xdmod/rawstatisticsconfig.json %config(noreplace) %{_sysconfdir}/xdmod/supremmconfig.json %config(noreplace) %{_sysconfdir}/xdmod/aggregation_meta/modw_aggregates.supremmfact_aggregation_meta.json