Accepting request 280337 from games

OBS-URL: https://build.opensuse.org/request/show/280337
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/SDL2?expand=0&rev=9

SDL2.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Fri Dec 19 10:44:54 UTC 2014 - jengelh@inai.de
+
+- Drop old arts/esound soundserver support.
+
+-------------------------------------------------------------------
+Thu Dec 18 09:46:46 UTC 2014 - jengelh@inai.de
+
+- Remove SDL2 obsoletes (we never had packages of that name).
+  Copy current Provides to baselibs.conf.
+
 -------------------------------------------------------------------
 Mon Jul 21 20:13:17 UTC 2014 - jengelh@inai.de
 

SDL2.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package SDL2
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -31,14 +31,11 @@ Source2:        http://libsdl.org/release/%name-%version.tar.gz.sig
 Source3:        %name.keyring
 Source4:        baselibs.conf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  alsa-devel >= 0.9.0
-BuildRequires:  arts-devel
 BuildRequires:  dos2unix
-BuildRequires:  esound-devel >= 0.2.8
-BuildRequires:  gcc
 BuildRequires:  gcc-c++
 BuildRequires:  nasm
-BuildRequires:  pkgconfig
+BuildRequires:  pkg-config
+BuildRequires:  pkgconfig(alsa) >= 0.9.0
 BuildRequires:  pkgconfig(dbus-1)
 BuildRequires:  pkgconfig(gl)
 BuildRequires:  pkgconfig(glib-2.0)
@@ -64,7 +61,7 @@ BuildRequires:  pkgconfig(libpulse-simple) >= 0.9
 BuildRequires:  pkgconfig(udev)
 BuildRequires:  pkgconfig(xext)
 BuildRequires:  pkgconfig(xi)
-%ifarch ppc ppc64
+%ifarch ppc ppc64 ppc64p7 ppc64le
 BuildRequires:  libspe2-devel
 %endif
 
@@ -76,7 +73,7 @@ across multiple platforms.
 %package -n %lname
 Summary:        Simple DirectMedia Layer Library
 Group:          System/Libraries
-Provides:       SDL2 = %{version}
+Provides:       SDL2 = %version-%release
 
 %description -n %lname
 This is the "Simple DirectMedia Layer" library. It provides a generic
@@ -86,7 +83,7 @@ across multiple platforms.
 %package -n libSDL2-devel
 Summary:        SDL2 Library Developer Files
 Group:          Development/Libraries/X11
-Requires:       %lname = %{version}
+Requires:       %lname = %version
 Requires:       c_compiler
 Requires:       pkgconfig
 Requires:       pkgconfig(gl)
@@ -95,7 +92,7 @@ Requires:       pkgconfig(glesv2)
 Requires:       pkgconfig(glu)
 Requires:       pkgconfig(x11)
 Requires:       pkgconfig(xproto)
-Provides:       SDL2-devel = %{version}
+Provides:       SDL2-devel = %version-%release
 
 %description -n libSDL2-devel
 This package contains files needed for development with the SDL2
@@ -112,8 +109,8 @@ dos2unix CREDITS.txt
 dos2unix COPYING.txt
 
 %build
-%configure \
+# In this instance, we do want --with-pic because of libSDL2main.a.
-    --with-pic \
+%configure --with-pic \
     --disable-rpath \
     --disable-alsa-shared \
     --disable-video-directfb
@@ -121,27 +118,27 @@ make %{?_smp_mflags}
 
 %install
 make install DESTDIR="%buildroot"
-rm -f %{buildroot}%{_libdir}/*.la
+rm -f "%buildroot/%_libdir"/*.la
-
+# We do not want static libs, but using --disable-static leads to make aborting
-%post -n %lname -p /sbin/ldconfig
+# halfway through. SDL2main.a we need to keep(?) for the stub symbol.
+find "%buildroot/%_libdir" -type f -name "*.a" ! -name "libSDL2main.a" -delete
 
+%post   -n %lname -p /sbin/ldconfig
 %postun -n %lname -p /sbin/ldconfig
 
 %files -n %lname
 %defattr(-,root,root)
 %doc BUGS.txt COPYING.txt CREDITS.txt README.txt README-SDL.txt
-%{_libdir}/libSDL2-2*.so.*
+%_libdir/libSDL2-2*.so.*
 
 %files -n libSDL2-devel
 %defattr(-,root,root)
 %doc TODO.txt WhatsNew.txt
-%{_bindir}/sdl2-config
+%_bindir/sdl2-config
-%{_libdir}/libSDL2.so
+%_libdir/libSDL2.so
-%{_libdir}/libSDL2.a
+%_libdir/libSDL2main.a
-%{_libdir}/libSDL2main.a
+%_includedir/SDL2/
-%{_libdir}/libSDL2_test.a
+%_datadir/aclocal/sdl2.m4
-%{_includedir}/SDL2/
+%_libdir/pkgconfig/sdl2.pc
-%{_datadir}/aclocal/sdl2.m4
-%{_libdir}/pkgconfig/sdl2.pc
 
 %changelog

baselibs.conf

@@ -1,8 +1,6 @@
 libSDL2-2_0-0
-  provides "SDL2-<targettype> = <version>"
+	provides "SDL2-<targettype> = <version>"
-  obsoletes "SDL2-<targettype> <= <version>"
 libSDL2-devel
-  provides "SDL2-devel-<targettype> = <version>"
+	provides "SDL2-devel-<targettype> = <version>"
-  obsoletes "SDL2-devel-<targettype> <= <version>"
+	requires -libSDL2-<targettype>
-  requires -libSDL2-<targettype>
+	requires "libSDL2-2_0-0-<targettype> = <version>"
-  requires "libSDL2-2_0-0-<targettype> = <version>"