- added config patch (removes -L/usr/%{_lib} from sdl-config --libs output, which...

  building of some packages against newly built libraries instead of old system versions)
- release 2

Changed files:
    SDL-config.patch -> 1.1
    SDL.spec -> 1.183

diff --git a/SDL-config.patch b/SDL-config.patch
new file mode 100644 (file)
index 0000000..de3d777
--- /dev/null
+++ b/SDL-config.patch
@@ -0,0 +1,16 @@
+--- SDL-1.2.15/sdl-config.in.orig      2012-01-19 07:30:06.000000000 +0100
++++ SDL-1.2.15/sdl-config.in   2012-06-16 13:05:43.265925020 +0200
+@@ -45,11 +45,11 @@
+       echo -I@includedir@/SDL @SDL_CFLAGS@
+       ;;
+ @ENABLE_SHARED_TRUE@    --libs)
+-@ENABLE_SHARED_TRUE@      echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@
++@ENABLE_SHARED_TRUE@      echo @SDL_RLD_FLAGS@ @SDL_LIBS@
+ @ENABLE_SHARED_TRUE@      ;;
+ @ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@    --static-libs)
+ @ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@    --libs|--static-libs)
+-@ENABLE_STATIC_TRUE@      echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_STATIC_LIBS@
++@ENABLE_STATIC_TRUE@      echo @SDL_RLD_FLAGS@ @SDL_STATIC_LIBS@
+ @ENABLE_STATIC_TRUE@      ;;
+     *)
+       echo "${usage}" 1>&2

diff --git a/SDL.spec b/SDL.spec
index da78b6e76cc0d88c8cd95e20153a863770735e33..3e28207dff93f92357c361ad6fbd7f250bdbebd1 100644 (file)
--- a/SDL.spec
+++ b/SDL.spec
@@ -27,7 +27,7 @@ Summary(pl.UTF-8):    SDL (Simple DirectMedia Layer) - Biblioteka do gier/multimedi
 Summary(zh_CN.UTF-8):  SDL (Simple DirectMedia Layer) Generic APIs - 游戏/多媒体库
 Name:          SDL
 Version:       1.2.15
-Release:       1
+Release:       2
 License:       LGPL v2.1+
 Group:         Libraries
 Source0:       http://www.libsdl.org/release/%{name}-%{version}.tar.gz
@@ -35,6 +35,7 @@ Source0:      http://www.libsdl.org/release/%{name}-%{version}.tar.gz
 Patch0:                %{name}-acfix.patch
 Patch1:                %{name}-new_gamma_ramp_support.patch
 Patch2:                fix-mouse-click.patch
+Patch3:                %{name}-config.patch
 URL:           http://www.libsdl.org/
 %{?with_directfb:BuildRequires:        DirectFB-devel >= 0.9.15}
 BuildRequires: OpenGL-GLU-devel
@@ -171,6 +172,7 @@ SDL - przykładowe programy.
 %patch0 -p1
 %{?with_new_gamma_ramp:%patch1 -p1}
 %patch2 -p1
+%patch3 -p1
 
 : > acinclude.m4
 %{!?with_alsa:echo 'AC_DEFUN([AM_PATH_ALSA],[$3])' >> acinclude.m4}