From 638efe18ecec54e2b665a35e5e62cba2e07ec2cb068e95b1e3add6c657fca3ae Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 3 May 2021 08:55:33 +0000 Subject: [PATCH] - package both xvnc-novnc-libexec.service and xvnc-novnc-lib.service source files OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/tigervnc?expand=0&rev=204 --- tigervnc.changes | 6 ++++++ tigervnc.spec | 19 +++++++++---------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/tigervnc.changes b/tigervnc.changes index 0ed65fa..4c7b60d 100644 --- a/tigervnc.changes +++ b/tigervnc.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon May 3 08:54:23 UTC 2021 - Stefan Dirsch + +- package both xvnc-novnc-libexec.service and xvnc-novnc-lib.service + source files + ------------------------------------------------------------------- Tue Apr 27 13:41:26 UTC 2021 - Scott Bradnick diff --git a/tigervnc.spec b/tigervnc.spec index 349bee6..0486f9d 100644 --- a/tigervnc.spec +++ b/tigervnc.spec @@ -128,19 +128,14 @@ Source11: index.vnc Source12: x11vnc Source13: xvnc@.service Source14: xvnc.socket -# Tumbleweed uses /usr/libexec/ -# Leap uses /usr/lib/ -# %if 0%{?suse_version} > 1500 -%if 0%{?suse_version} >= 1550 -Source15: xvnc-novnc-libexec.service -%else -Source15: xvnc-novnc-lib.service -%endif Source16: xvnc-novnc.socket Source17: tigervnc.firewalld Source18: tigervnc-https.firewalld Source19: xvnc.target - +# Tumbleweed uses /usr/libexec/ +Source21: xvnc-novnc-libexec.service +# Leap uses /usr/lib/ +Source22: xvnc-novnc-lib.service Patch1: tigervnc-newfbsize.patch Patch2: tigervnc-clean-pressed-key-on-exit.patch Patch3: u_tigervnc-ignore-epipe-on-write.patch @@ -372,9 +367,13 @@ install -D -m 755 %{SOURCE12} %{buildroot}%{_bindir}/x11vnc install -D %{SOURCE13} -m 0444 %{buildroot}%{_unitdir}/xvnc@.service install -D %{SOURCE14} -m 0444 %{buildroot}%{_unitdir}/xvnc.socket -install -D %{SOURCE15} -m 0444 %{buildroot}%{_unitdir}/xvnc-novnc.service install -D %{SOURCE16} -m 0444 %{buildroot}%{_unitdir}/xvnc-novnc.socket install -D %{SOURCE19} -m 0444 %{buildroot}%{_unitdir}/xvnc.target +%if 0%{?suse_version} >= 1550 +install -D %{SOURCE21} -m 0444 %{buildroot}%{_unitdir}/xvnc-novnc.service +%else +install -D %{SOURCE22} -m 0444 %{buildroot}%{_unitdir}/xvnc-novnc.service +%endif rm -rf %{buildroot}%{_datadir}/doc/tigervnc-*