- fixed build in current environment, release 3

[packages/crossmingw32-SDL.git] / crossmingw32-SDL.spec

diff --git a/crossmingw32-SDL.spec b/crossmingw32-SDL.spec
index 74c6a7d2e6ab92d9c0bed2a90572ccac5da3fd00..0039eed97de4f5f332c5d53a22497e0951fb5ca2 100644 (file)
--- a/crossmingw32-SDL.spec
+++ b/crossmingw32-SDL.spec
@@ -1,23 +1,23 @@
 %define                realname        SDL
-Summary:       SDL (Simple DirectMedia Layer) - Game/Multimedia Library - Mingw32 cross version
-Summary(pl.UTF-8):     SDL (Simple DirectMedia Layer) - Biblioteka do gier/multimediów - wersja skrośna dla Mingw32
+Summary:       SDL (Simple DirectMedia Layer) - Game/Multimedia Library - MinGW32 cross version
+Summary(pl.UTF-8):     SDL (Simple DirectMedia Layer) - Biblioteka do gier/multimediów - wersja skrośna dla MinGW32
 Name:          crossmingw32-%{realname}
-Version:       1.2.12
-Release:       1
+Version:       1.2.15
+Release:       3
 License:       LGPL v2.1+
 Group:         Libraries
 Source0:       http://www.libsdl.org/release/%{realname}-%{version}.tar.gz
-# Source0-md5: 544b4554986e51eed6d34435cf9c5f3f
-Patch0:                %{realname}-mmx-constraints.patch
-Patch1:                %{realname}-acfix.patch
+# Source0-md5: 9d96df8417572a2afb781a7c4c811a85
+Patch0:                %{realname}-acfix.patch
 URL:           http://www.libsdl.org/
-BuildRequires: autoconf
+BuildRequires: autoconf >= 2.59-9
 BuildRequires: automake
 BuildRequires: crossmingw32-gcc
+BuildRequires: crossmingw32-gcc-c++
 BuildRequires: crossmingw32-runtime
 BuildRequires: crossmingw32-w32api
 BuildRequires: crossmingw32-w32api-dx
-BuildRequires: libtool >= 2:1.4d
+BuildRequires: libtool >= 2:2.0
 BuildRequires: nasm
 BuildRequires: perl-modules
 BuildConflicts:        crossmingw32-dx70
@@ -31,15 +31,21 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _sysprefix              /usr
 %define                _prefix                 %{_sysprefix}/%{target}
+%define                _libdir                 %{_prefix}/lib
 %define                _pkgconfigdir           %{_prefix}/lib/pkgconfig
 %define                _dlldir                 /usr/share/wine/windows/system
 %define                __cc                    %{target}-gcc
 %define                __cxx                   %{target}-g++
+%define                __pkgconfig_provides    %{nil}
 
-%ifarch alpha sparc sparc64 sparcv9
-# alpha's -mieee and sparc's -mtune=* are not valid for target's gcc
+%ifnarch %{ix86}
+# arch-specific flags (like alpha's -mieee) are not valid for i386 gcc
 %define                optflags        -O2
 %endif
+# -z options are invalid for mingw linker, most of -f options are Linux-specific
+%define                filterout_ld    -Wl,-z,.*
+%define                filterout_c     -f[-a-z0-9=]*
+%define                filterout_cxx   -f[-a-z0-9=]*
 
 %description
 SDL (Simple DirectMedia Layer) is a library that allows you portable,
@@ -66,16 +72,16 @@ baixo nível a áudio, teclado, mouse e vídeo em várias plataformas.
 Essa biblioteca é usada por alguns jogos.
 
 %package static
-Summary:       Static SDL library (cross mingw32 version)
-Summary(pl.UTF-8):     Statyczna biblioteka SDL (wersja skrośna mingw32)
+Summary:       Static SDL library (cross MinGW32 version)
+Summary(pl.UTF-8):     Statyczna biblioteka SDL (wersja skrośna MinGW32)
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 
 %description static
-Static SDL library (cross mingw32 version).
+Static SDL library (cross MinGW32 version).
 
 %description static -l pl.UTF-8
-Statyczna biblioteka SDL (wersja skrośna mingw32).
+Statyczna biblioteka SDL (wersja skrośna MinGW32).
 
 %package dll
 Summary:       SDL - DLL library for Windows
@@ -91,7 +97,9 @@ SDL - biblioteka DLL dla Windows.
 %prep
 %setup -q -n %{realname}-%{version}
 %patch0 -p1
-%patch1 -p1
+
+: > acinclude.m4
+echo 'AC_DEFUN([AM_PATH_ESD],[$3])' >> acinclude.m4
 
 %build
 %{__libtoolize}
@@ -112,7 +120,7 @@ rm -rf $RPM_BUILD_ROOT
        DESTDIR=$RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT{%{_dlldir},%{_sysprefix}/bin}
-mv -f $RPM_BUILD_ROOT%{_prefix}/bin/*.dll $RPM_BUILD_ROOT%{_dlldir}
+%{__mv} $RPM_BUILD_ROOT%{_prefix}/bin/*.dll $RPM_BUILD_ROOT%{_dlldir}
 ln -s %{_bindir}/sdl-config $RPM_BUILD_ROOT%{_sysprefix}/bin/%{target}-sdl-config
 
 %if 0%{!?debug:1}
@@ -120,7 +128,7 @@ ln -s %{_bindir}/sdl-config $RPM_BUILD_ROOT%{_sysprefix}/bin/%{target}-sdl-confi
 %{target}-strip -g -R.comment -R.note $RPM_BUILD_ROOT%{_libdir}/*.a
 %endif
 
-rm -rf $RPM_BUILD_ROOT%{_datadir}/{aclocal,man}
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/{aclocal,man}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -133,6 +141,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libSDL.dll.a
 %{_libdir}/libSDL.la
 %{_libdir}/libSDLmain.a
+%{_libdir}/libSDLmain.la
 %{_includedir}/SDL
 %{_pkgconfigdir}/sdl.pc
 
@@ -142,4 +151,4 @@ rm -rf $RPM_BUILD_ROOT
 
 %files dll
 %defattr(644,root,root,755)
-%{_dlldir}/SDL.dll
+%{_dlldir}/libSDL-1-2-0.dll