From a68d10f1f54ceffd4a3a8544aa198dbff533eb64 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Wed, 24 May 2017 10:31:08 +0000 Subject: [PATCH] prefer "/lib/systemd/system" path over "/usr/lib/systemd/system" git-svn-id: https://xpra.org/svn/Xpra/trunk@15947 3bb7dfac-3a0b-4e04-842a-767bc560f471 --- rpmbuild/xpra.spec | 4 ++-- src/setup.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rpmbuild/xpra.spec b/rpmbuild/xpra.spec index 6ae04cc734..5e655e2a7e 100644 --- a/rpmbuild/xpra.spec +++ b/rpmbuild/xpra.spec @@ -527,8 +527,8 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/mime/packages/application-x-xpraconfig.xml %files common-server -%{_prefix}/lib/systemd/system/xpra.service -%{_prefix}/lib/systemd/system/xpra.socket +/lib/systemd/system/xpra.service +/lib/systemd/system/xpra.socket %{_prefix}/lib/cups/backend/xpraforwarder %config(noreplace) %{_sysconfdir}/sysconfig/xpra %config %{_prefix}/lib/tmpfiles.d/xpra.conf diff --git a/src/setup.py b/src/setup.py index 2ed5a6e06e..1bfbb518f8 100755 --- a/src/setup.py +++ b/src/setup.py @@ -1549,7 +1549,7 @@ def copytodir(src, dst_dir, chmod=0o644): if service_ENABLED: #Linux init service: if os.path.exists("/bin/systemctl"): - copytodir("service/xpra.service", "lib/systemd/system") + copytodir("service/xpra.service", "/lib/systemd/system") else: copytodir("service/xpra", "/etc/init.d") if os.path.exists("/etc/sysconfig"): @@ -1557,7 +1557,7 @@ def copytodir(src, dst_dir, chmod=0o644): elif os.path.exists("/etc/default"): copytodir("etc/sysconfig/xpra", "/etc/default") if sd_listen_ENABLED: - copytodir("service/xpra.socket", "lib/systemd/system") + copytodir("service/xpra.socket", "/lib/systemd/system") # add build_conf to build step