diff --git a/SDL2.changes b/SDL2.changes index 5307056..08de8df 100644 --- a/SDL2.changes +++ b/SDL2.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Dec 18 10:04:34 UTC 2014 - jengelh@inai.de + +------------------------------------------------------------------- +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 diff --git a/SDL2.spec b/SDL2.spec index 38a0a52..cefc995 100644 --- a/SDL2.spec +++ b/SDL2.spec @@ -76,7 +76,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 +86,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 +95,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 @@ -121,27 +121,26 @@ make %{?_smp_mflags} %install make install DESTDIR="%buildroot" -rm -f %{buildroot}%{_libdir}/*.la - -%post -n %lname -p /sbin/ldconfig +rm -f "%buildroot/%_libdir"/*.la +%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 -%{_libdir}/libSDL2.so -%{_libdir}/libSDL2.a -%{_libdir}/libSDL2main.a -%{_libdir}/libSDL2_test.a -%{_includedir}/SDL2/ -%{_datadir}/aclocal/sdl2.m4 -%{_libdir}/pkgconfig/sdl2.pc +%_bindir/sdl2-config +%_libdir/libSDL2.so +%_libdir/libSDL2.a +%_libdir/libSDL2main.a +%_libdir/libSDL2_test.a +%_includedir/SDL2/ +%_datadir/aclocal/sdl2.m4 +%_libdir/pkgconfig/sdl2.pc %changelog diff --git a/baselibs.conf b/baselibs.conf index f051fa8..53beed5 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,8 +1,6 @@ libSDL2-2_0-0 - provides "SDL2- = " - obsoletes "SDL2- <= " + provides "SDL2- = -" libSDL2-devel - provides "SDL2-devel- = " - obsoletes "SDL2-devel- <= " - requires -libSDL2- - requires "libSDL2-2_0-0- = " + provides "SDL2-devel- = -" + requires -libSDL2- + requires "libSDL2-2_0-0- = "