From bd27cbb432f06d1f1f94dd301c2c192230cacd34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Mon, 27 Oct 2014 23:22:11 +0100 Subject: RPM Packaging: update tdeaccessibility --- redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec | 10 ++-------- redhat/tdemultimedia/tdemultimedia-14.0.0.spec | 17 ++++++++++++----- 2 files changed, 14 insertions(+), 13 deletions(-) (limited to 'redhat') diff --git a/redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec b/redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec index 3f1ee3869..ee2ab1368 100644 --- a/redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec +++ b/redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec @@ -123,22 +123,16 @@ BuildRequires: libX11-devel BuildRequires: xorg-x11-devel %endif -# X11 Libraries +# XTST support %if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}xxf86dga-devel -BuildRequires: %{_lib}xxf86vm-devel %if 0%{?mgaversion} >= 4 BuildRequires: %{_lib}xtst-devel %else BuildRequires: %{_lib}xtst%{?mgaversion:6}-devel %endif %endif -%if 0%{?rhel} == 4 -BuildRequires: xorg-x11-devel -%endif %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220 -BuildRequires: libXxf86dga-devel -BuildRequires: libXxf86vm-devel +BuildRequires: libXtst-devel %endif # XI support diff --git a/redhat/tdemultimedia/tdemultimedia-14.0.0.spec b/redhat/tdemultimedia/tdemultimedia-14.0.0.spec index 3a347b899..c6250e8b3 100644 --- a/redhat/tdemultimedia/tdemultimedia-14.0.0.spec +++ b/redhat/tdemultimedia/tdemultimedia-14.0.0.spec @@ -159,11 +159,6 @@ BuildRequires: gstreamer-0_10-devel %if 0%{?mgaversion} || 0%{?mdkversion} BuildRequires: %{_lib}xxf86dga-devel BuildRequires: %{_lib}xxf86vm-devel -%if 0%{?mgaversion} >= 4 -BuildRequires: %{_lib}xtst-devel -%else -BuildRequires: %{_lib}xtst%{?mgaversion:6}-devel -%endif %endif %if 0%{?rhel} == 4 BuildRequires: xorg-x11-devel @@ -173,6 +168,18 @@ BuildRequires: libXxf86dga-devel BuildRequires: libXxf86vm-devel %endif +# XTST support +%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mgaversion} >= 4 +BuildRequires: %{_lib}xtst-devel +%else +BuildRequires: %{_lib}xtst%{?mgaversion:6}-devel +%endif +%endif +%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220 +BuildRequires: libXtst-devel +%endif + # XINE support %if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} == 18 || 0%{?fedora} == 19 || 0%{?with_xine} %define with_xine 1 -- cgit v1.2.1