- more general ix86 %%ifarchs

Changed files:
    ffmpeg.spec -> 1.33

diff --git a/ffmpeg.spec b/ffmpeg.spec
index 3556ae221f414095264747971a4428b8861fe0f4..377bfbd16db075853494ec968c3df5273ea2a2e9 100644 (file)
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -25,9 +25,11 @@ BuildRequires:       gcc >= 5:3.3.2-3
 %endif
 %{?with_imlib:BuildRequires:   imlib2-devel >= 1.1.0-2}
 BuildRequires: libtool >= 2:1.4d-3
-%ifarch i586 i686 athlon
+%ifarch %{ix86}
+%ifnarch i386 i486
 BuildRequires: nasm
 %endif
+%endif
 BuildRequires: zlib-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -134,7 +136,10 @@ Statyczne biblioteki ffmpeg (libavcodec i libavformat).
        --enable-shared \
        --enable-a52bin \
        --enable-faadbin \
-%ifnarch i586 i686 athlon
+%ifnarch %{ix86}
+       --disable-mmx \
+%endif
+%ifarch i386 i486
        --disable-mmx \
 %endif
        --cc="%{__cc}" \