- xorg modular deps.

[packages/SDL.git] / SDL.spec

diff --git a/SDL.spec b/SDL.spec
index c3e5c358e998d9eeedc14ad1eea3af8b7103e3d5..732f7afc3a36a0256f2bb239a5021bad2affeb11 100644 (file)
--- a/SDL.spec
+++ b/SDL.spec
@@ -14,20 +14,21 @@ Summary:    SDL (Simple DirectMedia Layer) - Game/Multimedia Library
 Summary(pl):   SDL (Simple DirectMedia Layer) - Biblioteka do gier/multimediów
 Summary(zh_CN):        SDL (Simple DirectMedia Layer) Generic APIs - ÓÎÏ·/¶àýÌå¿â
 Name:          SDL
-Version:       1.2.8
-%define                _snap   20040616
-Release:       0.%{_snap}.1
+Version:       1.2.10
+%define                _snap   051030
+Release:       0.%{_snap}.2
 License:       LGPL
 Group:         X11/Libraries
 #Source0:      http://www.libsdl.org/release/%{name}-%{version}.tar.gz
-Source0:       %{name}-%{version}-%{_snap}.tar.bz2
-# Source0-md5: 2f854840a028f3eca616f702139bc762
+Source0:       %{name}-%{_snap}.tar.bz2
+# Source0-md5: e0ab8e77644db78b30e3b68965bdfd6c
 Patch0:                %{name}-byteorder.patch
 Patch1:                %{name}-amfix.patch
 Patch2:                %{name}-lpthread.patch
 Patch3:                %{name}-no_rpath_in_sdl-config.patch
 Patch4:                %{name}-mmx-constraints.patch
 Patch5:                %{name}-caca.patch
+Patch6:                %{name}-gcc4.patch
 URL:           http://www.libsdl.org/
 %{?with_directfb:BuildRequires:        DirectFB-devel >= 0.9.15}
 BuildRequires: OpenGL-devel
@@ -46,7 +47,8 @@ BuildRequires:        nasm
 %endif
 BuildRequires: perl-modules
 %{?with_directfb:BuildRequires:        pkgconfig >= 1:0.7}
-%{?with_svgalib:BuildRequires: svgalib-devel >= 1.4.0}
+%{?with_svga:BuildRequires:    svgalib-devel >= 1.4.0}
+BuildRequires: xorg-lib-libXext-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -78,12 +80,7 @@ Summary(uk): 
 Summary(zh_CN):        SDL (Simple DirectMedia Layer) ¿ª·¢¿â
 Group:         X11/Development/Libraries
 Requires:      %{name} = %{version}-%{release}
-%if %{with xlibs}
-Requires:      libX11-devel
-Requires:      libXext-devel
-%else
-Requires:      XFree86-devel >= 4.0.2
-%endif
+Requires:      xorg-lib-libXext-devel
 %{?with_alsa:Requires: alsa-lib-devel}
 %{?with_caca:Requires: libcaca-devel}
 %{?with_nas:Requires:  nas-devel}
@@ -145,17 +142,20 @@ SDL - example programs.
 SDL - przyk³adowe programy.
 
 %prep
-%setup -q -n %{name}12
+%setup -q -n %{name}-%{_snap}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 # get COPY_ARCH_SRC, remove the rest
 head -n 20 acinclude.m4 > acinclude.tmp
 mv -f acinclude.tmp acinclude.m4
+%{!?with_alsa:echo 'AC_DEFUN([AM_PATH_ALSA],[$3])' >> acinclude.m4}
+%{!?with_esd:echo 'AC_DEFUN([AM_PATH_ESD],[$3])' >> acinclude.m4}
 
 find . -type d -name CVS -print | xargs rm -rf {} \;