From aa1945cf472f37404150b9d5b9bf05aa0d7d78522b2f2994e896936086a0844f Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 2 Apr 2022 08:42:42 +0000 Subject: [PATCH] Defer r118 change until another time OBS-URL: https://build.opensuse.org/package/show/games/SDL2?expand=0&rev=119 --- SDL2.changes | 6 ------ SDL2.spec | 9 ++++----- baselibs.conf | 5 ++--- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/SDL2.changes b/SDL2.changes index 760a4cb..f061074 100644 --- a/SDL2.changes +++ b/SDL2.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Wed Mar 30 18:46:17 UTC 2022 - Jan Engelhardt - -- Rename devel package to just %name-devel, which is what most - openSUSE packages use. - ------------------------------------------------------------------- Sun Jan 16 12:27:09 UTC 2022 - Carsten Ziepke diff --git a/SDL2.spec b/SDL2.spec index 03715c2..55b00aa 100644 --- a/SDL2.spec +++ b/SDL2.spec @@ -87,7 +87,7 @@ This is the "Simple DirectMedia Layer" library. It provides a generic API for access to audio, keyboard, mouse, and display framebuffer across multiple platforms. -%package devel +%package -n libSDL2-devel Summary: SDL2 Library Developer Files Group: Development/Libraries/X11 Requires: %lname = %version @@ -99,10 +99,9 @@ Requires: pkgconfig(glesv2) Requires: pkgconfig(glu) Requires: pkgconfig(x11) Requires: pkgconfig(xproto) -Provides: libSDL2-devel = %version-%release -Obsoletes: libSDL2-devel < %version-%release +Provides: SDL2-devel = %version-%release -%description devel +%description -n libSDL2-devel This package contains files needed for development with the SDL2 library. @@ -142,7 +141,7 @@ rm -fv "%buildroot/%_libdir/libSDL2.a" "%buildroot/%_libdir/libSDL2_test.a" %doc README.md README-SDL.txt %_libdir/libSDL2-2*.so.* -%files devel +%files -n libSDL2-devel %doc WhatsNew.txt %_bindir/sdl2-config %_libdir/libSDL2.so diff --git a/baselibs.conf b/baselibs.conf index bfd5be2..d1dd351 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,7 +1,6 @@ libSDL2-2_0-0 provides "SDL2- = " -SDL2-devel - provides "libSDL2-devel- = " - obsoletes "libSDL2-devel- < " +libSDL2-devel + provides "SDL2-devel- = " requires -libSDL2- requires "libSDL2-2_0-0- = "