From 5695f918a861024d7a5ddcf08789851b11d61ae1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Mon, 1 Jun 2020 18:57:38 +0200 Subject: RPM: fix xine dependencies --- redhat/applications/amarok/amarok.spec | 18 +++++++++++------- redhat/applications/kaffeine/kaffeine.spec | 4 ++-- redhat/applications/kmplayer/kmplayer.spec | 4 ++-- redhat/main/tdemultimedia/tdemultimedia.spec | 4 ++-- 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/redhat/applications/amarok/amarok.spec b/redhat/applications/amarok/amarok.spec index 2ac8a4c8d..c7c9513a2 100644 --- a/redhat/applications/amarok/amarok.spec +++ b/redhat/applications/amarok/amarok.spec @@ -210,17 +210,21 @@ BuildRequires: %{_lib}inotifytools-devel %endif # XINE support -%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} == 18 || 0%{?fedora} == 19 || 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?rhel} == 7 +%if 0%{?fedora} && 0%{?fedora} <= 31 %define with_xine 1 -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}xine1.2-devel +BuildRequires: xine-lib-devel %endif -%if 0%{?fedora} || 0%{?rhel} +%if 0%{?rhel} && 0%{?rhel} <= 7 +#define with_xine 1 BuildRequires: xine-lib-devel %endif -%if 0%{?suse_version} -BuildRequires: libxine-devel +%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} +%define with_xine 1 +BuildRequires: %{_lib}xine1.2-devel %endif +%if 0%{?sle_version} && 0%{?sle_version} <= 150000 +%define with_xine 1 +BuildRequires: libxine-devel %endif # YAUAP support @@ -471,7 +475,7 @@ fi \ %{?with_libvisual:-DWITH_LIBVISUAL=ON} \ -DWITH_KONQSIDEBAR=ON \ - %{?with_xine:-DWITH_XINE=ON} \ + %{?with_xine:-DWITH_XINE=ON} %{?!with_xine:-DWITH_XINE=OFF}\ %{?with_yauap:-DWITH_YAUAP=ON} \ -DWITH_AKODE=OFF \ %{?with_gpod:-DWITH_IPOD=ON} \ diff --git a/redhat/applications/kaffeine/kaffeine.spec b/redhat/applications/kaffeine/kaffeine.spec index dc5a939e4..5fdf4113c 100644 --- a/redhat/applications/kaffeine/kaffeine.spec +++ b/redhat/applications/kaffeine/kaffeine.spec @@ -140,9 +140,9 @@ BuildRequires: gstreamer1-plugins-base-devel >= 1.0 %endif # XINE support -%if 0%{?fedora} || 0%{?rhel} >= 4 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} || 0%{?suse_version} %define with_xine 1 -%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} BuildRequires: %{_lib}xine1.2-devel %endif %if 0%{?fedora} || 0%{?rhel} diff --git a/redhat/applications/kmplayer/kmplayer.spec b/redhat/applications/kmplayer/kmplayer.spec index df66a616c..7bf2ae731 100644 --- a/redhat/applications/kmplayer/kmplayer.spec +++ b/redhat/applications/kmplayer/kmplayer.spec @@ -101,9 +101,9 @@ BuildRequires: gstreamer1-plugins-base-devel >= 1.0 %endif # XINE support -%if 0%{?fedora} || 0%{?rhel} >= 4 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} || 0%{?suse_version} %define with_xine 1 -%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} BuildRequires: %{_lib}xine1.2-devel %endif %if 0%{?fedora} || 0%{?rhel} diff --git a/redhat/main/tdemultimedia/tdemultimedia.spec b/redhat/main/tdemultimedia/tdemultimedia.spec index 263ada4e8..9ecb2f4f9 100644 --- a/redhat/main/tdemultimedia/tdemultimedia.spec +++ b/redhat/main/tdemultimedia/tdemultimedia.spec @@ -174,9 +174,9 @@ BuildRequires: libXxf86vm-devel %endif # XINE support -%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?rhel} >= 5 +%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} || 0%{?suse_version} %define with_xine 1 -%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} BuildRequires: %{_lib}xine1.2-devel %endif %if 0%{?fedora} || 0%{?rhel} -- cgit v1.2.3