summaryrefslogtreecommitdiffstats
path: root/redhat/main/tdemultimedia
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2018-06-19 20:09:51 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2018-06-19 20:11:02 +0200
commit77398a607fe09f49f40349bce398661c43e77143 (patch)
treef425bd25663358da9a4ad30ba58ac2c5577624c9 /redhat/main/tdemultimedia
parent3f0ae4ce7e948c666db00647454b4ec32d796768 (diff)
downloadtde-packaging-77398a607fe09f49f40349bce398661c43e77143.tar.gz
tde-packaging-77398a607fe09f49f40349bce398661c43e77143.zip
RPM: avoid linking to libmad on non-x86 architectures
Diffstat (limited to 'redhat/main/tdemultimedia')
-rw-r--r--redhat/main/tdemultimedia/tdemultimedia-14.0.0-autotools.spec9
-rw-r--r--redhat/main/tdemultimedia/tdemultimedia-14.0.0-cmake.spec9
-rw-r--r--redhat/main/tdemultimedia/tdemultimedia-3.5.13.2.spec4
3 files changed, 14 insertions, 8 deletions
diff --git a/redhat/main/tdemultimedia/tdemultimedia-14.0.0-autotools.spec b/redhat/main/tdemultimedia/tdemultimedia-14.0.0-autotools.spec
index 26743e5d8..44fd60fab 100644
--- a/redhat/main/tdemultimedia/tdemultimedia-14.0.0-autotools.spec
+++ b/redhat/main/tdemultimedia/tdemultimedia-14.0.0-autotools.spec
@@ -94,8 +94,11 @@ BuildRequires: taglib-devel
%define with_akode 1
BuildRequires: trinity-akode-devel
-%define with_mad 1
-%{?with_mad:BuildRequires: libakode_mpeg_decoder}
+# MAD support
+%ifarch %{ix86} x86_64
+%define with_libmad 1
+%{?with_libmad:BuildRequires: libakode_mpeg_decoder}
+%endif
# ZLIB support
BuildRequires: zlib-devel
@@ -740,7 +743,7 @@ This package contains akode plugins for aRts.
%{tde_libdir}/mcop/akodeXiphPlayObject.mcopclass
# Requires MAD support
-%{?with_mad:%{tde_libdir}/mcop/akodeMPEGPlayObject.mcopclass}
+%{?with_libmad:%{tde_libdir}/mcop/akodeMPEGPlayObject.mcopclass}
%endif
diff --git a/redhat/main/tdemultimedia/tdemultimedia-14.0.0-cmake.spec b/redhat/main/tdemultimedia/tdemultimedia-14.0.0-cmake.spec
index 97540d5d4..086f7ec9f 100644
--- a/redhat/main/tdemultimedia/tdemultimedia-14.0.0-cmake.spec
+++ b/redhat/main/tdemultimedia/tdemultimedia-14.0.0-cmake.spec
@@ -95,8 +95,11 @@ BuildRequires: taglib-devel
%define with_akode 1
BuildRequires: trinity-akode-devel
-%define with_mad 1
-%{?with_mad:BuildRequires: libakode_mpeg_decoder}
+# MAD support
+%ifarch %{ix86} x86_64
+%define with_libmad 1
+%{?with_libmad:BuildRequires: libakode_mpeg_decoder}
+%endif
# ZLIB support
BuildRequires: zlib-devel
@@ -754,7 +757,7 @@ This package contains akode plugins for aRts.
%{tde_libdir}/mcop/akodeXiphPlayObject.mcopclass
# Requires MAD support
-%{?with_mad:%{tde_libdir}/mcop/akodeMPEGPlayObject.mcopclass}
+%{?with_libmad:%{tde_libdir}/mcop/akodeMPEGPlayObject.mcopclass}
%endif
diff --git a/redhat/main/tdemultimedia/tdemultimedia-3.5.13.2.spec b/redhat/main/tdemultimedia/tdemultimedia-3.5.13.2.spec
index 4a4f9f433..397314c05 100644
--- a/redhat/main/tdemultimedia/tdemultimedia-3.5.13.2.spec
+++ b/redhat/main/tdemultimedia/tdemultimedia-3.5.13.2.spec
@@ -91,7 +91,7 @@ BuildRequires: taglib-devel
# AKODE support
%if 0%{?with_akode}
BuildRequires: trinity-akode-devel
-%{?with_mad:BuildRequires: trinity-akode-libmad}
+%{?with_libmad:BuildRequires: trinity-akode-libmad}
%endif
# ZLIB support
@@ -869,7 +869,7 @@ This package contains akode plugins for aRts.
%{tde_libdir}/mcop/akodeXiphPlayObject.mcopclass
# Requires MAD support
-%{?with_mad:%{tde_libdir}/mcop/akodeMPEGPlayObject.mcopclass}
+%{?with_libmad:%{tde_libdir}/mcop/akodeMPEGPlayObject.mcopclass}
%post -n trinity-libarts-akode
/sbin/ldconfig