- updated to 1.2.6

Changed files:
    crossmingw32-SDL_image.spec -> 1.15

diff --git a/crossmingw32-SDL_image.spec b/crossmingw32-SDL_image.spec
index b3802f47ca35d9551f03cc348674f8e7e14faca1..487ad36f25c68b861cd951d4c79cb22dd500f241 100644 (file)
--- a/crossmingw32-SDL_image.spec
+++ b/crossmingw32-SDL_image.spec
@@ -2,38 +2,39 @@
 Summary:       Simple DirectMedia Layer - Sample Image Loading Library - Mingw32 cross version
 Summary(pl.UTF-8):     Przykładowa biblioteka do ładowania obrazków - wersja skrośna dla Mingw32
 Name:          crossmingw32-%{realname}
 Summary:       Simple DirectMedia Layer - Sample Image Loading Library - Mingw32 cross version
 Summary(pl.UTF-8):     Przykładowa biblioteka do ładowania obrazków - wersja skrośna dla Mingw32
 Name:          crossmingw32-%{realname}

-Version:       1.2.5
+Version:       1.2.6

 Release:       1
 Release:       1

-License:       LGPL
+License:       LGPL v2.1+

 Group:         Libraries
 Source0:       http://www.libsdl.org/projects/SDL_image/release/%{realname}-%{version}.tar.gz
 # Source0-md5: cd006109a73bf7dcc93e1c3ed15ee782
 URL:           http://www.libsdl.org/projects/SDL_image/
 BuildRequires: autoconf
 BuildRequires: automake
 Group:         Libraries
 Source0:       http://www.libsdl.org/projects/SDL_image/release/%{realname}-%{version}.tar.gz
 # Source0-md5: cd006109a73bf7dcc93e1c3ed15ee782
 URL:           http://www.libsdl.org/projects/SDL_image/
 BuildRequires: autoconf
 BuildRequires: automake

-BuildRequires: crossmingw32-SDL
+BuildRequires: crossmingw32-SDL >= 1.2.10

 BuildRequires: crossmingw32-gcc
 BuildRequires: crossmingw32-gcc

-BuildRequires: crossmingw32-libjpeg
-BuildRequires: crossmingw32-libpng
+BuildRequires: crossmingw32-libjpeg >= 6b
+BuildRequires: crossmingw32-libpng >= 1.2.0

 BuildRequires: crossmingw32-w32api
 BuildRequires: crossmingw32-zlib
 BuildRequires: libtool
 BuildRequires: crossmingw32-w32api
 BuildRequires: crossmingw32-zlib
 BuildRequires: libtool

-Requires:      crossmingw32-SDL
+Requires:      crossmingw32-SDL >= 1.2.10

 Requires:      crossmingw32-runtime
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                no_install_post_strip   1
 
 Requires:      crossmingw32-runtime
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                no_install_post_strip   1
 

-%define                target          i386-mingw32
-%define                target_platform i386-pc-mingw32
-%define                arch            %{_prefix}/%{target}
-%define                gccarch         %{_prefix}/lib/gcc-lib/%{target}
-%define                gcclib          %{_prefix}/lib/gcc-lib/%{target}/%{version}
+%define                target                  i386-mingw32
+%define                target_platform         i386-pc-mingw32

 
 

-%define                __cc            %{target}-gcc
-%define                __cxx           %{target}-g++
+%define                _sysprefix              /usr
+%define                _prefix                 %{_sysprefix}/%{target}
+%define                _dlldir                 /usr/share/wine/windows/system
+%define                __cc                    %{target}-gcc
+%define                __cxx                   %{target}-g++

 
 %ifarch alpha sparc sparc64 sparcv9
 
 %ifarch alpha sparc sparc64 sparcv9

+# alpha's -mieee and sparc's -mtune=* are not valid for target's gcc

 %define                optflags        -O2
 %endif
 
 %define                optflags        -O2
 %endif
 


@@ -42,21 +43,39 @@ This is a simple library to load images of various formats as SDL
 surfaces. This library currently supports BMP, PPM, PCX, GIF, JPEG,
 and PNG formats.
 
 surfaces. This library currently supports BMP, PPM, PCX, GIF, JPEG,
 and PNG formats.
 

+This package contains the cross version for Win32.
+

 %description -l pl.UTF-8
 Jest to prosta biblioteka służąca do ładowania różnego formatu
 obrazków jako powierzchni SDL. W chwili obecnej biblioteka obsługuje
 następujące formaty: BMP, PPM, PCX, GIF, JPEG oraz PNG.
 
 %description -l pl.UTF-8
 Jest to prosta biblioteka służąca do ładowania różnego formatu
 obrazków jako powierzchni SDL. W chwili obecnej biblioteka obsługuje
 następujące formaty: BMP, PPM, PCX, GIF, JPEG oraz PNG.
 

+Ten pakiet zawiera wersję skrośną dla Win32.
+
+%package static
+Summary:       Static SDL_image library (cross mingw32 version)
+Summary(pl.UTF-8):     Statyczna biblioteka SDL_image (wersja skrośna mingw32)
+Group:         Development/Libraries
+Requires:      %{name} = %{version}-%{release}
+
+%description static
+Static SDL_image library (cross mingw32 version).
+
+%description static -l pl.UTF-8
+Statyczna biblioteka SDL_image (wersja skrośna mingw32).
+

 %package dll
 %package dll

-Summary:       %{realname} - DLL library for Windows
-Summary(pl.UTF-8):     %{realname} - biblioteka DLL dla Windows
+Summary:       SDL_image - DLL library for Windows
+Summary(pl.UTF-8):     SDL_image - biblioteka DLL dla Windows

 Group:         Applications/Emulators
 Group:         Applications/Emulators

+Requires:      crossmingw32-SDL-dll >= 1.2.10
+Requires:      wine

 
 %description dll
 
 %description dll

-%{realname} - DLL library for Windows.
+SDL_image - DLL library for Windows.

 
 %description dll -l pl.UTF-8
 
 %description dll -l pl.UTF-8

-%{realname} - biblioteka DLL dla Windows.
+SDL_image - biblioteka DLL dla Windows.

 
 %prep
 %setup -q -n %{realname}-%{version}
 
 %prep
 %setup -q -n %{realname}-%{version}


@@ -64,64 +83,56 @@ Group:              Applications/Emulators
 rm -f acinclude.m4
 
 %build
 rm -f acinclude.m4
 
 %build

-CC=%{target}-gcc ; export CC
-CXX=%{target}-g++ ; export CXX
-LD=%{target}-ld ; export LD
-AR=%{target}-ar ; export AR
-AS=%{target}-as ; export AS
-CROSS_COMPILE=1 ; export CROSS_COMPILE
-CPPFLAGS="-I%{arch}/include" ; export CPPFLAGS
-RANLIB=%{target}-ranlib ; export RANLIB
-LDSHARED="%{target}-gcc -shared" ; export LDSHARED
-TARGET="%{target}" ; export TARGET
-

 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
 %{__automake}
 # no sdl test, because it requires configured wine to work
 %configure \
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
 %{__automake}
 # no sdl test, because it requires configured wine to work
 %configure \

-       png_lib=png.dll \
-       --host=%{_host} \
+       png_lib=libpng12-0.dll \
+       --host=%{target} \

        --target=%{target} \
        --target=%{target} \

-       --with-sdl-prefix=%{arch} \
+       --with-sdl-prefix=%{_prefix} \

        --disable-sdltest \
        --enable-bmp \
        --enable-gif \
        --enable-jpg \
        --enable-pcx \
        --enable-png \
        --disable-sdltest \
        --enable-bmp \
        --enable-gif \
        --enable-jpg \
        --enable-pcx \
        --enable-png \

-       --enable-tga \
-       --disable-shared
+       --enable-tga

 
 

-%{__make} libSDL_image.la
+# LIBS hack for libtool not detecting libraries without .la files
+%{__make} \
+       LIBS="$(%{_bindir}/sdl-config --libs | sed -e 's/\(-lmingw32\|-lSDLmain\)/-Wl,\1/g')"

 
 

-%{__cc} --shared IMG*.o -Wl,--enable-auto-image-base -o SDL_image.dll -Wl,--out-implib,libSDL_image.dll.a -lSDL -lpng -ljpeg
+%install
+rm -rf $RPM_BUILD_ROOT

 
 

-cp -f .libs/libSDL_image.a .
+%{__make} install \
+       DESTDIR=$RPM_BUILD_ROOT
+
+install -d $RPM_BUILD_ROOT%{_dlldir}
+mv -f $RPM_BUILD_ROOT%{_prefix}/bin/*.dll $RPM_BUILD_ROOT%{_dlldir}

 
 %if 0%{!?debug:1}
 
 %if 0%{!?debug:1}

-%{target}-strip -R.comment -R.note *.dll
-%{target}-strip -g -R.comment -R.note *.a
+%{target}-strip --strip-unneeded -R.comment -R.note $RPM_BUILD_ROOT%{_dlldir}/*.dll
+%{target}-strip -g -R.comment -R.note $RPM_BUILD_ROOT%{_libdir}/*.a

 %endif
 
 %endif
 

-%install
-rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{arch}/{include/SDL,lib}
-install -d $RPM_BUILD_ROOT%{_datadir}/wine/windows/system
-
-install *.a $RPM_BUILD_ROOT%{arch}/lib
-install SDL_image.h $RPM_BUILD_ROOT%{arch}/include/SDL
-install *.dll $RPM_BUILD_ROOT%{_datadir}/wine/windows/system
-

 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)

-%{arch}/include/SDL/*
-%{arch}/lib/*
+%doc CHANGES README
+%{_libdir}/libSDL_image.dll.a
+%{_libdir}/libSDL_image.la
+%{_includedir}/SDL/SDL_image.h
+
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libSDL_image.a

 
 %files dll
 %defattr(644,root,root,755)
 
 %files dll
 %defattr(644,root,root,755)

-%{_datadir}/wine/windows/system/*.dll
+%{_dlldir}/libSDL_image-*.dll