From a221ed54aa985c004d35de3c9f47f575dcaafaba Mon Sep 17 00:00:00 2001 From: François Andriot Date: Sun, 16 Mar 2014 13:00:13 +0100 Subject: RPM packaging: update R14 packages --- redhat/applications/kaffeine/kaffeine-14.0.0.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'redhat/applications/kaffeine') diff --git a/redhat/applications/kaffeine/kaffeine-14.0.0.spec b/redhat/applications/kaffeine/kaffeine-14.0.0.spec index 078caea0d..fd64b2898 100644 --- a/redhat/applications/kaffeine/kaffeine-14.0.0.spec +++ b/redhat/applications/kaffeine/kaffeine-14.0.0.spec @@ -34,8 +34,6 @@ URL: http://kaffeine.sourceforge.net/ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -Patch0: kaffeine-14.0.0-ftbfs.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: trinity-tqtinterface-devel >= %{tde_version} @@ -110,8 +108,12 @@ BuildRequires: libgstreamer-plugins-base-devel >= 0.10 %if 0%{?fedora} || 0%{?rhel} >= 4 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} %define with_xine 1 %if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{pclinuxos} +BuildRequires: %{_lib}xine-devel +%else BuildRequires: %{_lib}xine1.2-devel %endif +%endif %if 0%{?fedora} || 0%{?rhel} BuildRequires: xine-lib-devel %endif @@ -129,8 +131,10 @@ BuildRequires: lame-devel # WTF support %if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?pclinuxos} == 0 BuildRequires: kernel-headers %endif +%endif %if 0%{?rhel} >= 5 || 0%{?fedora} BuildRequires: glibc-kernheaders %endif @@ -230,7 +234,6 @@ Requires: %{name} = %{version}-%{release} %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%patch0 -p1 -b .ftbfs %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -- cgit v1.2.3