- quick workaround for gcc PR21398.

[packages/SDL.git] / SDL.spec

diff --git a/SDL.spec b/SDL.spec
index 20f8528ed6242eb0bc7331f08d80a64225f5900d..8f80f36278b5eea8edb13f47f759f0d7386d4555 100644 (file)
--- a/SDL.spec
+++ b/SDL.spec
@@ -11,33 +11,26 @@
 %bcond_without esd             # without EsounD audio support
 #
 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.6
-Release:       4
+Version:       1.2.8
+Release:       2
 License:       LGPL
 Group:         X11/Libraries
 Source0:       http://www.libsdl.org/release/%{name}-%{version}.tar.gz
-# Source0-md5: 9011f147f23ec535515291d0c9c6904c
+# Source0-md5: 37aaf9f069f9c2c18856022f35de9f8c
 Patch0:                %{name}-byteorder.patch
-Patch1:                %{name}-fixlibs.patch
-Patch2:                %{name}-amfix.patch
-Patch3:                %{name}-lpthread.patch
-Patch4:                %{name}-no_rpath_in_sdl-config.patch
-Patch5:                %{name}-lt15.patch
-Patch6:                %{name}-dlopen-acfix.patch
-Patch7:                %{name}-mmx-constraints.patch
-Patch8:                %{name}-am18.patch
-Patch9:                %{name}-caca.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
+Patch7:                %{name}-gcc-pr21398-workaround.patch
 URL:           http://www.libsdl.org/
 %{?with_directfb:BuildRequires:        DirectFB-devel >= 0.9.15}
 BuildRequires: OpenGL-devel
-BuildRequires: XFree86-devel >= 4.0.2
 %{?with_aalib:BuildRequires:   aalib-devel}
 %{?with_alsa:BuildRequires:    alsa-lib-devel >= 0.9.0}
 %{?with_arts:BuildRequires:    artsc-devel >= 1.1}
@@ -52,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)
 
@@ -84,8 +77,13 @@ Summary(ru): 
 Summary(uk):   æÁÊÌÉ, ÎÅÏÂȦÄΦ ÄÌÑ ÒÏÚÒÏÂËÉ ÐÒÏÇÒÁÍ, ÝÏ ×ÉËÏÒÉÓÔÏ×ÕÀÔØ SDL
 Summary(zh_CN):        SDL (Simple DirectMedia Layer) ¿ª·¢¿â
 Group:         X11/Development/Libraries
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{version}-%{release}
+%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}
@@ -115,7 +113,7 @@ Summary(pt_BR):     Biblioteca est
 Summary(ru):   óÔÁÔÉÞÅÓËÉÅ ÂÉÂÌÉÏÔÅËÉ ÄÌÑ ÒÁÚÒÁÂÏÔËÉ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ SDL
 Summary(uk):   óÔÁÔÉÞΦ ¦Â̦ÏÔÅËÉ ÄÌÑ ÒÏÚÒÏÂËÉ Ú ×ÉËÏÒÉÓÔÁÎÎÑÍ SDL
 Group:         X11/Development/Libraries
-Requires:      %{name}-devel = %{version}
+Requires:      %{name}-devel = %{version}-%{release}
 
 %description static
 SDL - static libraries.
@@ -138,7 +136,7 @@ Biblioteca est
 Summary:       SDL - example programs
 Summary(pl):   SDL - programy przyk³adowe
 Group:         X11/Development/Libraries
-Requires:      %{name}-devel = %{version}
+Requires:      %{name}-devel = %{version}-%{release}
 
 %description examples
 SDL - example programs.
@@ -156,11 +154,9 @@ SDL - przyk
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-%patch8 -p1
-%patch9 -p1
 
 # get COPY_ARCH_SRC, remove the rest
-head -n 16 acinclude.m4 > acinclude.tmp
+head -n 20 acinclude.m4 > acinclude.tmp
 mv -f acinclude.tmp acinclude.m4
 
 find . -type d -name CVS -print | xargs rm -rf {} \;
@@ -217,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