From 562049cd694f6dd0927b9880227fc4f6da008839 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Wed, 5 Aug 2015 20:25:18 +0200 Subject: RPM Packaging: massive update --- redhat/main/tdemultimedia/tdemultimedia-14.0.0.spec | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'redhat/main/tdemultimedia/tdemultimedia-14.0.0.spec') diff --git a/redhat/main/tdemultimedia/tdemultimedia-14.0.0.spec b/redhat/main/tdemultimedia/tdemultimedia-14.0.0.spec index b364073c5..60177e324 100644 --- a/redhat/main/tdemultimedia/tdemultimedia-14.0.0.spec +++ b/redhat/main/tdemultimedia/tdemultimedia-14.0.0.spec @@ -43,7 +43,7 @@ Name: trinity-%{tde_pkg} -Summary: Multimedia applications for the Trinity Desktop Environment (TDE) +Summary: Multimedia applications for the Trinity Desktop Environment Version: %{tde_version} Release: %{?!preversion:2}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} Group: Productivity/Multimedia/Sound/Utilities @@ -96,10 +96,11 @@ BuildRequires: brp-check-trinity BuildRequires: taglib-devel # AKODE support -%if 0%{?with_akode} +%define with_akode 1 BuildRequires: trinity-akode-devel -%{?with_mad:BuildRequires: trinity-akode-libmad} -%endif + +%define with_mad 1 +%{?with_mad:BuildRequires: libakode_mpeg_decoder} # ZLIB support BuildRequires: zlib-devel @@ -1272,7 +1273,7 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" %{?with_xine:--with-xine} %{!?with_xine:--without-xine} # Fix unexplained "undefined reference to `__stack_chk_fail'" -%if 0%{?mgaversion} == 4 || 0%{?pclinuxos} +%if 0%{?mgaversion} >= 4 || 0%{?pclinuxos} %__sed -i "noatun/app/Makefile" -e "/^libtdeinit_noatun_la_LDFLAGS/ s/$/ -Wl,-lc/" %endif @@ -1303,7 +1304,7 @@ export PATH="%{tde_bindir}:${PATH}" # Copy missing icons from 'crystalsvg' theme (tdelibs) %__mkdir_p "%{?buildroot}{tde_datadir}/icons/hicolor/"{16x16,22x22,32x32,48x48,64x64}"/apps/" pushd $RPM_BUILD_ROOT%{tde_datadir}/icons/ -for i in {16,22,32,48,64}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/cdaudio_unmount.png hicolor/"$i"x"$i"/apps/kcmaudiocd.png; done +for i in {16,22,32,48,64}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/media-optical-cdaudio.png hicolor/"$i"x"$i"/apps/kcmaudiocd.png; done popd # Updates applications categories for openSUSE -- cgit v1.2.1