From 73ac2d2cb6d64b9f4e8e6c53f65d6ae122938998a046db1b4d5714d687221608 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 30 Apr 2019 06:04:53 +0000 Subject: [PATCH] Accepting request 699478 from home:zhangxiaofei:branches:X11:RemoteDesktop - BuildRequires libXfont2-devel for SLE12-SP4 and later OBS-URL: https://build.opensuse.org/request/show/699478 OBS-URL: https://build.opensuse.org/package/show/X11:RemoteDesktop/xorgxrdp?expand=0&rev=22 --- xorgxrdp.changes | 5 +++++ xorgxrdp.spec | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/xorgxrdp.changes b/xorgxrdp.changes index 075c496..528fee0 100644 --- a/xorgxrdp.changes +++ b/xorgxrdp.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Apr 29 17:11:02 UTC 2019 - Felix Zhang + +- BuildRequires libXfont2-devel for SLE12-SP4 and later + ------------------------------------------------------------------- Tue Dec 18 09:36:17 UTC 2018 - Felix Zhang diff --git a/xorgxrdp.spec b/xorgxrdp.spec index fd07314..7e52670 100644 --- a/xorgxrdp.spec +++ b/xorgxrdp.spec @@ -1,7 +1,7 @@ # # spec file for package xorgxrdp # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 @@ -34,8 +34,8 @@ BuildRequires: xorg-x11-server-sdk BuildRequires: xrdp-devel BuildRequires: pkgconfig(xorg-macros) Requires: xrdp >= 0.9.1 -# For 42.x keep to use libXfont-devel -%if 0%{?suse_version} > 1320 +# For Leap 42.x and SLE 12.x <= 12.3, keep to use libXfont-devel +%if 0%{?suse_version} > 1320 || 0%{?sle_version} > 120300 BuildRequires: libXfont2-devel %else BuildRequires: libXfont-devel