- xorg modular deps.

[packages/SDL.git] / SDL.spec

diff --git a/SDL.spec b/SDL.spec
index 151919b1ea9e243195ec9447e7e393bde46ac91e..732f7afc3a36a0256f2bb239a5021bad2affeb11 100644 (file)
--- a/SDL.spec
+++ b/SDL.spec
@@ -9,34 +9,29 @@
 %bcond_without alsa            # without ALSA audio support
 %bcond_without arts            # without aRts audio support
 %bcond_without esd             # without EsounD audio support
-%bcond_with    xlibs
 #
 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.7
-Release:       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-md5: d29b34b6ba3ed213893fc9d8d35e357a
+#Source0:      http://www.libsdl.org/release/%{name}-%{version}.tar.gz
+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}-gcc34.patch
+Patch6:                %{name}-gcc4.patch
 URL:           http://www.libsdl.org/
 %{?with_directfb:BuildRequires:        DirectFB-devel >= 0.9.15}
 BuildRequires: OpenGL-devel
-%if %{with xlibs}
-BuildRequires: libX11-devel
-BuildRequires: libXext-devel
-%else
-BuildRequires: XFree86-devel >= 4.0.2
-%endif
 %{?with_aalib:BuildRequires:   aalib-devel}
 %{?with_alsa:BuildRequires:    alsa-lib-devel >= 0.9.0}
 %{?with_arts:BuildRequires:    artsc-devel >= 1.1}
@@ -51,8 +46,9 @@ BuildRequires:        libtool >= 2:1.4d
 BuildRequires: nasm
 %endif
 BuildRequires: perl-modules
-%{?with_directfb:BuildRequires:        pkgconfig >= 0.7}
-%{?with_svgalib:BuildRequires: svgalib-devel >= 1.4.0}
+%{?with_directfb:BuildRequires:        pkgconfig >= 1:0.7}
+%{?with_svga:BuildRequires:    svgalib-devel >= 1.4.0}
+BuildRequires: xorg-lib-libXext-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -84,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}
@@ -151,7 +142,7 @@ SDL - example programs.
 SDL - przyk³adowe programy.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{_snap}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -163,6 +154,8 @@ SDL - przyk
 # 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 {} \;
 
@@ -218,7 +211,7 @@ rm -rf docs/man3 docs/{Makefile*,.cvsignore} docs/html/{Makefile*,.cvsignore}
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post   -p /sbin/ldconfig
+%post  -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 %files