From 58dc320064f66ad8a374b02e21ed4016c413da2fa623ad2f6025e8682694abe4 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 11 Nov 2013 13:52:36 +0000 Subject: [PATCH] Accepting request 205917 from KDE:Extra - Fix quasselcore.service, EnvironmentFile belongs into [Service] section and use ${FOO} rather than $FOO for proper expansion (Check https://fedoraproject.org/wiki/Packaging%3aSystemd#EnvironmentFiles_and_support_for_.2Fetc.2Fsysconfig_files) (forwarded request 205896 from saschpe) OBS-URL: https://build.opensuse.org/request/show/205917 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/quassel?expand=0&rev=14 --- quassel.changes | 7 +++++++ service.quasselcore | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/quassel.changes b/quassel.changes index 0d7366b..4ec325f 100644 --- a/quassel.changes +++ b/quassel.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Nov 5 11:55:01 UTC 2013 - speilicke@suse.com + +- Fix quasselcore.service, EnvironmentFile belongs into [Service] + section and use ${FOO} rather than $FOO for proper expansion (Check + https://fedoraproject.org/wiki/Packaging%3aSystemd#EnvironmentFiles_and_support_for_.2Fetc.2Fsysconfig_files) + ------------------------------------------------------------------- Mon Oct 14 12:14:21 UTC 2013 - tchvatal@suse.com diff --git a/service.quasselcore b/service.quasselcore index 1a4078e..50b0a7a 100644 --- a/service.quasselcore +++ b/service.quasselcore @@ -1,12 +1,12 @@ [Unit] Description=Quassel Core After=network.target -EnvironmentFile=-/etc/sysconfig/quasselcore [Service] +EnvironmentFile=-/etc/sysconfig/quasselcore PIDFile=/var/run/quassel.pid User=quasselcore -ExecStart=/usr/bin/quasselcore --listen=$QUASSELCORE_LISTEN --configdir=/var/lib/quasselcore --logfile=/var/log/quassel/quasselcore +ExecStart=/usr/bin/quasselcore --listen=${QUASSELCORE_LISTEN} --configdir=/var/lib/quasselcore --logfile=/var/log/quassel/quasselcore [Install] WantedBy=multi-user.target