- AC-branch merge:

  - add check for byteswap.h header
  - Error: Runtime CPU detection only works for x86, x86-64 and PPC
- rel 4

Changed files:
    mplayer.spec -> 1.388

diff --git a/mplayer.spec b/mplayer.spec
index 93754375f5ad7f6911d2eb0de36c3036958f5ec5..deb6a79c2cf7924896c85dcd6267ce1087a46053 100644 (file)
--- a/mplayer.spec
+++ b/mplayer.spec
@@ -63,7 +63,7 @@
 %undefine      with_vidix
 %endif
 
-%ifarch %{x8664} sparc sparc64
+%ifnarch %{ix86} %{x8664} ppc ppc64
 %undefine      with_runtime
 %endif
 
@@ -74,7 +74,7 @@
 %endif
 
 %define                subver  rc2
-%define                rel             3
+%define                rel             4
 
 Summary:       MPlayer - THE Movie Player for UN*X
 Summary(de.UTF-8):     MPlayer ist ein unter der freien GPL-Lizenz stehender Media-Player
@@ -123,6 +123,7 @@ Patch22:    %{name}-ffmpeg.patch
 Patch23:       %{name}-live.patch
 Patch24:       %{name}-fontconfig_sub.patch
 Patch25:       http://www.mplayerhq.hu/MPlayer/patches/stream_cddb_fix_20080120.diff
+Patch26:       %{name}-check-byteswap.patch
 URL:           http://www.mplayerhq.hu/
 %{?with_directfb:BuildRequires:        DirectFB-devel}
 BuildRequires: OpenAL-devel
@@ -342,6 +343,7 @@ done
 cd stream
 %patch25 -p0
 cd -
+%patch26 -p1
 
 %build
 %if %{with shared}