From 199cdd24542e2002ac70eb7c2dd9b9289d26886111c7021c7586853e3872c59a Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Tue, 19 Jun 2018 10:58:23 +0000 Subject: [PATCH 1/2] Accepting request 617693 from home:aeszter:branches:systemsmanagement Fix path in unit files (BOO #1098184). OBS-URL: https://build.opensuse.org/request/show/617693 OBS-URL: https://build.opensuse.org/package/show/systemsmanagement/cfengine?expand=0&rev=171 --- cf-execd.service | 2 +- cf-monitord.service | 2 +- cf-serverd.service | 2 +- cfengine.changes | 5 +++++ cfengine.spec | 4 ++-- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/cf-execd.service b/cf-execd.service index 0336159..25cb1d9 100644 --- a/cf-execd.service +++ b/cf-execd.service @@ -4,7 +4,7 @@ After=syslog.target [Service] Type=forking -ExecStart=/usr/sbin/cf-execd +ExecStart=/usr/bin/cf-execd [Install] WantedBy=multi-user.target diff --git a/cf-monitord.service b/cf-monitord.service index 34db31b..1577ab5 100644 --- a/cf-monitord.service +++ b/cf-monitord.service @@ -4,7 +4,7 @@ After=syslog.target [Service] Type=forking -ExecStart=/usr/sbin/cf-monitord +ExecStart=/usr/bin/cf-monitord [Install] WantedBy=multi-user.target diff --git a/cf-serverd.service b/cf-serverd.service index 13d236c..c2d5bd9 100644 --- a/cf-serverd.service +++ b/cf-serverd.service @@ -4,7 +4,7 @@ After=syslog.target [Service] Type=forking -ExecStart=/usr/sbin/cf-serverd +ExecStart=/usr/bin/cf-serverd [Install] WantedBy=multi-user.target diff --git a/cfengine.changes b/cfengine.changes index ade653b..1c4d493 100644 --- a/cfengine.changes +++ b/cfengine.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jun 19 09:33:16 UTC 2018 - aeszter@gwdg.de + +- fix path in unit files + ------------------------------------------------------------------- Mon Dec 4 11:24:38 UTC 2017 - kkaempf@suse.com diff --git a/cfengine.spec b/cfengine.spec index b99b008..5a9b648 100644 --- a/cfengine.spec +++ b/cfengine.spec @@ -1,7 +1,7 @@ # # spec file for package cfengine # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -40,7 +40,7 @@ Release: 0 #define basedir /var/lib/%{name} #define workdir %{basedir}/work Summary: Configuration management framework -License: GPL-3.0 +License: GPL-3.0-only Group: Productivity/Networking/System Url: http://www.cfengine.org/ Source: %{srcname}.tar.gz From a603606505fbd6319d95840dc3895f8350d002fdc2d843c64a7bc15aa581e7ba Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Tue, 19 Jun 2018 11:00:02 +0000 Subject: [PATCH 2/2] - Use %license instead of %doc OBS-URL: https://build.opensuse.org/package/show/systemsmanagement/cfengine?expand=0&rev=172 --- cfengine.changes | 5 +++++ cfengine.spec | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/cfengine.changes b/cfengine.changes index 1c4d493..61cf7f9 100644 --- a/cfengine.changes +++ b/cfengine.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jun 19 10:58:32 UTC 2018 - adam.majer@suse.de + +- Use %license instead of %doc + ------------------------------------------------------------------- Tue Jun 19 09:33:16 UTC 2018 - aeszter@gwdg.de diff --git a/cfengine.spec b/cfengine.spec index 5a9b648..46d7f0f 100644 --- a/cfengine.spec +++ b/cfengine.spec @@ -346,7 +346,8 @@ fi %files %defattr(-,root,root) -%doc ChangeLog LICENSE README.md +%doc ChangeLog README.md +%license LICENSE %{_bindir}/cf-agent %{_bindir}/cf-execd %{_bindir}/cf-key