summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2014-10-28 19:15:22 +0100
committerFrançois Andriot <albator78@libertysurf.fr>2014-10-28 19:15:22 +0100
commitb108a17ffeedc41f788c29d5f8ec2ddc02c96106 (patch)
treec91bffe724bca942ba424883367e7237189d2a2c
parent8ff9a5191fd4905b9389daa2fab2bb45579ccdfb (diff)
downloadtde-packaging-b108a17ffeedc41f788c29d5f8ec2ddc02c96106.tar.gz
tde-packaging-b108a17ffeedc41f788c29d5f8ec2ddc02c96106.zip
RPM Packaging: update tdemultimedia
-rw-r--r--redhat/dependencies/tqt3/tqt3-14.0.0.spec2
-rw-r--r--redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec53
-rw-r--r--redhat/tdemultimedia/tdemultimedia-14.0.0.spec12
3 files changed, 1 insertions, 66 deletions
diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
index 73336203d..9b3b3b6e2 100644
--- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec
+++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
@@ -165,7 +165,7 @@ BuildRequires: cups-devel
%endif
%{?xft_devel:BuildRequires: %{xft_devel}}
-# Xext support
+# XEXT support
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
%define xext_devel libXext-devel
%endif
diff --git a/redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec b/redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec
index ee2ab1368..5a0c9f255 100644
--- a/redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec
+++ b/redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec
@@ -93,11 +93,6 @@ BuildRequires: trinity-akode-devel
# ALSA support
BuildRequires: alsa-lib-devel
-# X11 Libraries
-%if 0%{?fedora} > 4 || 0%{?rhel} > 4
-BuildRequires: libXtst-devel
-%endif
-
# XCB support
%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?pclinuxos}
BuildRequires: libxcb-devel
@@ -108,54 +103,6 @@ BuildRequires: %{_lib}xcb-devel
%endif
%endif
-# X11 stuff
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?mgaversion} >= 4
-BuildRequires: %{_lib}x11-devel
-%else
-BuildRequires: %{_lib}x11%{?mgaversion:_6}-devel
-%endif
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
-BuildRequires: libX11-devel
-%endif
-%if 0%{?rhel} == 4 || 0%{?suse_version} == 1140
-BuildRequires: xorg-x11-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
-
-# XI support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: %{_lib}xi-devel
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
-BuildRequires: libXi-devel
-%endif
-
-# XEXT support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?mgaversion} >= 4
-BuildRequires: %{_lib}xext-devel
-%else
-BuildRequires: %{_lib}xext%{?mgaversion:6}-devel
-%endif
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
-BuildRequires: libXext-devel
-%endif
-
-
# XAU support
%if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?mgaversion} >= 4
diff --git a/redhat/tdemultimedia/tdemultimedia-14.0.0.spec b/redhat/tdemultimedia/tdemultimedia-14.0.0.spec
index deed6e9b0..1e3f20d96 100644
--- a/redhat/tdemultimedia/tdemultimedia-14.0.0.spec
+++ b/redhat/tdemultimedia/tdemultimedia-14.0.0.spec
@@ -163,18 +163,6 @@ 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