- quick workaround for gcc PR21398.

[packages/SDL.git] / SDL.spec

diff --git a/SDL.spec b/SDL.spec
index 835fd6375a7e006ecac57fc0bf426cfd5f72ae19..8f80f36278b5eea8edb13f47f759f0d7386d4555 100644 (file)
--- a/SDL.spec
+++ b/SDL.spec
@@ -9,39 +9,28 @@
 %bcond_without alsa            # without ALSA audio support
 %bcond_without arts            # without aRts audio support
 %bcond_without esd             # without EsounD audio support
-%bcond_without xlibs
 #
 Summary:       SDL (Simple DirectMedia Layer) - Game/Multimedia Library
-Summary(es):   Simple DirectMedia Layer
 Summary(pl):   SDL (Simple DirectMedia Layer) - Biblioteka do gier/multimediów
-Summary(pt_BR):        Simple DirectMedia Layer
-Summary(ru):   Simple DirectMedia Layer
-Summary(uk):   Simple DirectMedia Layer
 Summary(zh_CN):        SDL (Simple DirectMedia Layer) Generic APIs - ÓÎÏ·/¶àýÌå¿â
 Name:          SDL
-Version:       1.2.7
-Release:       1
+Version:       1.2.8
+Release:       2
 License:       LGPL
 Group:         X11/Libraries
 Source0:       http://www.libsdl.org/release/%{name}-%{version}.tar.gz
-# Source0-md5: d29b34b6ba3ed213893fc9d8d35e357a
+# Source0-md5: 37aaf9f069f9c2c18856022f35de9f8c
 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
+Patch7:                %{name}-gcc-pr21398-workaround.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
-BuildRequires: libXau-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}
@@ -56,7 +45,7 @@ BuildRequires:        libtool >= 2:1.4d
 BuildRequires: nasm
 %endif
 BuildRequires: perl-modules
-%{?with_directfb:BuildRequires:        pkgconfig >= 0.7}
+%{?with_directfb:BuildRequires:        pkgconfig >= 1:0.7}
 %{?with_svgalib:BuildRequires: svgalib-devel >= 1.4.0}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -89,7 +78,12 @@ Summary(uk): 
 Summary(zh_CN):        SDL (Simple DirectMedia Layer) ¿ª·¢¿â
 Group:         X11/Development/Libraries
 Requires:      %{name} = %{version}-%{release}
-#Requires:     XFree86-devel >= 4.0.2
+%if %{with xlibs}
+Requires:      libX11-devel
+Requires:      libXext-devel
+%else
+Requires:      XFree86-devel >= 4.0.2
+%endif
 %{?with_alsa:Requires: alsa-lib-devel}
 %{?with_caca:Requires: libcaca-devel}
 %{?with_nas:Requires:  nas-devel}
@@ -159,6 +153,7 @@ SDL - przyk
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 # get COPY_ARCH_SRC, remove the rest
 head -n 20 acinclude.m4 > acinclude.tmp
@@ -218,7 +213,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