From 230547f2390085d695ca87b2bcfe5930bc577d2e558960b8672076026d857255 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 18 Dec 2014 10:40:34 +0000 Subject: [PATCH] Accepting request 265621 from home:dimstar:xterm OBS-URL: https://build.opensuse.org/request/show/265621 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=91 --- xdm.changes | 7 +++++++ xdm.spec | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/xdm.changes b/xdm.changes index 34ab826..b33bb11 100644 --- a/xdm.changes +++ b/xdm.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Dec 17 20:38:54 UTC 2014 - dimstar@opensuse.org + +- On openSUSE > 13.2, xterm has been split into xterm-bin for the + program and xterm for the app launcher. We only need the program, + so conditionall Require xterm-bin. + ------------------------------------------------------------------- Mon Dec 15 18:37:00 UTC 2014 - Led diff --git a/xdm.spec b/xdm.spec index dab3b91..184cd59 100644 --- a/xdm.spec +++ b/xdm.spec @@ -77,7 +77,11 @@ Requires: /sbin/pidof Requires: logrotate Requires: sessreg Requires: xrdb +%if 0%{?suse_version} > 1320 +Requires: xterm-bin +%else Requires: xterm +%endif Recommends: dbus-1-x11 # This was part of the xorg-x11 package up to version 7.6 Conflicts: xorg-x11 <= 7.6