From a94e135d723c7b863c739ed4161256f0d3ab5563 Mon Sep 17 00:00:00 2001 From: Johan Cwiklinski <jo...@x-tnd.be> Date: Fri, 10 Feb 2017 08:34:59 +0100 Subject: Rename file so it will be directly opened on 'systemctl edit'
Change .service comment, patch has been refused upstream --- fusioninventory-agent.spec | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec index fee1a00..cd62ec3 100644 --- a/fusioninventory-agent.spec +++ b/fusioninventory-agent.spec @@ -13,9 +13,7 @@ Version: 2.3.18 Release: 3%{?dist} Source0: https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz Source1: %{name}.cron -#From upstream proposed changes, see: -#https://github.com/fusioninventory/fusioninventory-agent/pull/227 -#kept local to avoid upstream BC breaks +#Use systemd override capabilities Source10: %{name}.service Source11: %{name}.service.conf #Apply https://github.com/fusioninventory/fusioninventory-agent/commit/25404f038f99bd091e0fb2368879e848500f5082 @@ -233,8 +231,7 @@ install -m 644 -D logrotate %{buildroot}%{_sysconfdir}/logrotate.d/%{name} install -m 644 -D %{name}.conf %{buildroot}%{_sysconfdir}/sysconfig/%{name} install -m 755 -Dp %{SOURCE1} %{buildroot}%{_sysconfdir}/cron.hourly/%{name} install -m 644 -D %{SOURCE10} %{buildroot}%{_unitdir}/%{name}.service -install -m 644 -D %{SOURCE11} %{buildroot}%{_sysconfdir}/systemd/system/%{name}.service.d/%{name}.conf - +install -m 644 -D %{SOURCE11} %{buildroot}%{_sysconfdir}/systemd/system/%{name}.service.d/override.conf # Yum plugin installation install -m 644 -D contrib/yum-plugin/%{name}.py %{buildroot}%{_prefix}/lib/yum-plugins/%{name}.py @@ -263,7 +260,7 @@ install -m 644 -D contrib/yum-plugin/%{name}.conf %{buildroot}%{_sysconfdir}/yum %{_sysconfdir}/cron.hourly/%{name} %{_unitdir}/%{name}.service %dir %{_sysconfdir}/systemd/system/%{name}.service.d -%{_sysconfdir}/systemd/system/%{name}.service.d/%{name}.conf +%{_sysconfdir}/systemd/system/%{name}.service.d/override.conf %{_bindir}/fusioninventory-agent %{_bindir}/fusioninventory-injector %{_mandir}/man1/fusioninventory-agent* -- cgit v1.1 https://src.fedoraproject.org/cgit/fusioninventory-agent.git/commit/?h=master&id=a94e135d723c7b863c739ed4161256f0d3ab5563 _______________________________________________ perl-devel mailing list -- perl-devel@lists.fedoraproject.org To unsubscribe send an email to perl-devel-le...@lists.fedoraproject.org