From db64b6fbb05ed03569d91b9f9799ba19745c9d1e927637edf53f3b4e7c468271 Mon Sep 17 00:00:00 2001 From: Eric Schirra Date: Tue, 27 Nov 2018 18:22:55 +0000 Subject: [PATCH] Accepting request 652220 from home:ecsos:server - Remove %config from service files. Changes must not do in system location, user must do this changes in /etc/systemd/system. OBS-URL: https://build.opensuse.org/request/show/652220 OBS-URL: https://build.opensuse.org/package/show/network:utilities/matomo?expand=0&rev=18 --- matomo.changes | 6 ++++++ matomo.rpmlintrc | 2 -- matomo.spec | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/matomo.changes b/matomo.changes index 06a4abb..2a1181c 100644 --- a/matomo.changes +++ b/matomo.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Nov 27 17:55:29 UTC 2018 - ecsos@opensuse.org + +- Remove %config from service files. Changes must not do in system + location, user must do this changes in /etc/systemd/system. + ------------------------------------------------------------------- Thu Nov 22 18:07:12 UTC 2018 - Jan Engelhardt diff --git a/matomo.rpmlintrc b/matomo.rpmlintrc index a7e0659..5947a27 100644 --- a/matomo.rpmlintrc +++ b/matomo.rpmlintrc @@ -2,8 +2,6 @@ addFilter("hidden-file-or-dir") addFilter("macro-in-comment") addFilter("suse-missing-rclink matomo-archive") -addFilter("non-etc-or-var-file-marked-as-conffile /usr/lib/systemd/system/matomo-archive.service") -addFilter("non-etc-or-var-file-marked-as-conffile /usr/lib/systemd/system/matomo-archive.timer") addFilter("zero-length /srv/www/matomo/plugins/Morpheus/stylesheets/base/font.css") addFilter("pem-certificate") addFilter("non-conffile-in-etc /etc/matomo/environment/dev.php") diff --git a/matomo.spec b/matomo.spec index 8043e51..41bb638 100644 --- a/matomo.spec +++ b/matomo.spec @@ -160,8 +160,8 @@ fi %config(noreplace) %{ap_sysconfdir}/conf.d/%{name}.conf %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %config(noreplace) %{_sysconfdir}/cron.d/%{name}-archive -%config(noreplace) %{_unitdir}/%{name}-archive.service -%config(noreplace) %{_unitdir}/%{name}-archive.timer +%{_unitdir}/%{name}-archive.service +%{_unitdir}/%{name}-archive.timer %dir %attr(0750,%{ap_usr},%{ap_grp}) %{_sysconfdir}/%{name} %dir %attr(0750,%{ap_usr},%{ap_grp}) %{_sysconfdir}/%{name}/environment %defattr(640,%{ap_usr},%{ap_grp},750)