From 269f8b11f2ae12f9fb214db4d4779abc291df6badd1d7d386865b49bf7caebe0 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 18 Dec 2014 10:07:37 +0000 Subject: [PATCH 1/7] Some cleanups - remove useless obsoletes, copy provides OBS-URL: https://build.opensuse.org/package/show/games/SDL2?expand=0&rev=29 --- SDL2.changes | 9 +++++++++ SDL2.spec | 29 ++++++++++++++--------------- baselibs.conf | 10 ++++------ 3 files changed, 27 insertions(+), 21 deletions(-) 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- = " From b73f2bad322c39b5e30606cfe01f7aedc7fe60b74059d4f921d431266642c799 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 19 Dec 2014 10:58:51 +0000 Subject: [PATCH 2/7] Remove arts/esound support OBS-URL: https://build.opensuse.org/package/show/games/SDL2?expand=0&rev=30 --- SDL2.changes | 5 ++++- SDL2.spec | 13 +++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/SDL2.changes b/SDL2.changes index 08de8df..e832b3d 100644 --- a/SDL2.changes +++ b/SDL2.changes @@ -1,5 +1,8 @@ ------------------------------------------------------------------- -Thu Dec 18 10:04:34 UTC 2014 - jengelh@inai.de +Fri Dec 19 10:44:54 UTC 2014 - jengelh@inai.de + +- Drop old arts/esound soundserver support. + Remove --with-pic, we build with PIC by default anyway. ------------------------------------------------------------------- Thu Dec 18 09:46:46 UTC 2014 - jengelh@inai.de diff --git a/SDL2.spec b/SDL2.spec index cefc995..f0537b2 100644 --- a/SDL2.spec +++ b/SDL2.spec @@ -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: 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 %power64 BuildRequires: libspe2-devel %endif @@ -113,7 +110,6 @@ dos2unix COPYING.txt %build %configure \ - --with-pic \ --disable-rpath \ --disable-alsa-shared \ --disable-video-directfb @@ -122,6 +118,9 @@ make %{?_smp_mflags} %install make install DESTDIR="%buildroot" rm -f "%buildroot/%_libdir"/*.la +# We do not want static libs, but using --disable-static leads to make aborting +# halfway through. +find "%buildroot/%_libdir" -type f -name "*.a" ! -name "libSDL2main.a" -delete %post -n %lname -p /sbin/ldconfig %postun -n %lname -p /sbin/ldconfig @@ -136,9 +135,7 @@ rm -f "%buildroot/%_libdir"/*.la %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 From 865e910e9c77a742ccba6a1c4bf676a7c667101160cf34c01d84b4ada421aca5 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 6 Jan 2015 12:34:00 +0000 Subject: [PATCH 3/7] is unknown in baselibs OBS-URL: https://build.opensuse.org/package/show/games/SDL2?expand=0&rev=31 --- SDL2.spec | 2 +- baselibs.conf | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/SDL2.spec b/SDL2.spec index f0537b2..9e85f9c 100644 --- a/SDL2.spec +++ b/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 diff --git a/baselibs.conf b/baselibs.conf index 53beed5..d1dd351 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,6 +1,6 @@ libSDL2-2_0-0 - provides "SDL2- = -" + provides "SDL2- = " libSDL2-devel - provides "SDL2-devel- = -" + provides "SDL2-devel- = " requires -libSDL2- requires "libSDL2-2_0-0- = " From 5ae15ccc2531219170c72ed6d2e383a0daba6b36297e7efae7e93123587f3645 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 6 Jan 2015 12:37:17 +0000 Subject: [PATCH 4/7] bs_sched does not know about %power64 OBS-URL: https://build.opensuse.org/package/show/games/SDL2?expand=0&rev=32 --- SDL2.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SDL2.spec b/SDL2.spec index 9e85f9c..494b1b2 100644 --- a/SDL2.spec +++ b/SDL2.spec @@ -61,7 +61,7 @@ BuildRequires: pkgconfig(libpulse-simple) >= 0.9 BuildRequires: pkgconfig(udev) BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(xi) -%ifarch ppc %power64 +%ifarch ppc ppc64 ppc64p7 ppc64le BuildRequires: libspe2-devel %endif From 0fc864a705a9d8832bafc28f1c447c43795d76ef754156be6bb5bbfa19f456e1 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 8 Jan 2015 09:05:38 +0000 Subject: [PATCH 5/7] pkgconfig's real name is pkg-config OBS-URL: https://build.opensuse.org/package/show/games/SDL2?expand=0&rev=33 --- SDL2.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SDL2.spec b/SDL2.spec index 494b1b2..062b60b 100644 --- a/SDL2.spec +++ b/SDL2.spec @@ -34,7 +34,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dos2unix BuildRequires: gcc-c++ BuildRequires: nasm -BuildRequires: pkgconfig +BuildRequires: pkg-config BuildRequires: pkgconfig(alsa) >= 0.9.0 BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(gl) From b5d37807248506706b1923ec8bfa61674bab6ad04dd53af36ce122edbb9e1e14 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 8 Jan 2015 13:38:01 +0000 Subject: [PATCH 6/7] OBS-URL: https://build.opensuse.org/package/show/games/SDL2?expand=0&rev=34 --- SDL2.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/SDL2.spec b/SDL2.spec index 062b60b..9e2cd51 100644 --- a/SDL2.spec +++ b/SDL2.spec @@ -109,7 +109,8 @@ dos2unix CREDITS.txt dos2unix COPYING.txt %build -%configure \ +# In this instance, we do want --with-pic because of libSDL2main.a. +%configure --with-pic \ --disable-rpath \ --disable-alsa-shared \ --disable-video-directfb @@ -119,7 +120,7 @@ make %{?_smp_mflags} make install DESTDIR="%buildroot" rm -f "%buildroot/%_libdir"/*.la # We do not want static libs, but using --disable-static leads to make aborting -# halfway through. +# 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 From db8dc84b160ba47feb8fd74e33d79be68ede7d98eee1a4972f66a1b84e05771d Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 8 Jan 2015 14:07:49 +0000 Subject: [PATCH 7/7] OBS-URL: https://build.opensuse.org/package/show/games/SDL2?expand=0&rev=35 --- SDL2.changes | 1 - 1 file changed, 1 deletion(-) diff --git a/SDL2.changes b/SDL2.changes index e832b3d..ecbd75a 100644 --- a/SDL2.changes +++ b/SDL2.changes @@ -2,7 +2,6 @@ Fri Dec 19 10:44:54 UTC 2014 - jengelh@inai.de - Drop old arts/esound soundserver support. - Remove --with-pic, we build with PIC by default anyway. ------------------------------------------------------------------- Thu Dec 18 09:46:46 UTC 2014 - jengelh@inai.de