diff options
| author | François Andriot <albator78@libertysurf.fr> | 2014-03-16 13:00:13 +0100 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2014-03-16 13:00:13 +0100 |
| commit | a221ed54aa985c004d35de3c9f47f575dcaafaba (patch) | |
| tree | 15114e61b2c45512cf5903c2e0a498202e722c91 /redhat/tdemultimedia/tdemultimedia-14.0.0.spec | |
| parent | a0837c0ccd4281fe21a97f284c8c06c1990d5f5e (diff) | |
| download | tde-packaging-a221ed54aa985c004d35de3c9f47f575dcaafaba.tar.gz tde-packaging-a221ed54aa985c004d35de3c9f47f575dcaafaba.zip | |
RPM packaging: update R14 packages
Diffstat (limited to 'redhat/tdemultimedia/tdemultimedia-14.0.0.spec')
| -rw-r--r-- | redhat/tdemultimedia/tdemultimedia-14.0.0.spec | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/redhat/tdemultimedia/tdemultimedia-14.0.0.spec b/redhat/tdemultimedia/tdemultimedia-14.0.0.spec index 699b26734..86fc4171a 100644 --- a/redhat/tdemultimedia/tdemultimedia-14.0.0.spec +++ b/redhat/tdemultimedia/tdemultimedia-14.0.0.spec @@ -133,8 +133,12 @@ BuildRequires: libXt-devel %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 @@ -1143,6 +1147,11 @@ noatun plugins. ########## +# FIXME 2014/03/15: FTBFS on PCLINUXOS ... Need to remove -fstack-protector +%if 0%{?pclinuxos} +%define _ssp_cflags -fno-stack-protector --param=ssp-buffer-size=4%{?_serverbuild_flags: %_serverbuild_flags} +%endif + %prep %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} @@ -1188,7 +1197,7 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" %{?_with_taglib} %{!?_with_taglib:--without-taglib} \ %{?with_xine:--with-xine} %{!?with_xine:--without-xine} -%__make %{?_smp_mflags} +%__make %{?_smp_mflags} || %__make %install |