From bd5268b7d4e74a46375085bc9a8fc1cbe6868a15f0542d56fb6cc3c4937366f0 Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Thu, 19 May 2022 13:06:23 +0000 Subject: [PATCH] Accepting request 978078 from home:jengelh:branches:games - Build with to pkgconfig(sdl) so we can use sdl12_compat. OBS-URL: https://build.opensuse.org/request/show/978078 OBS-URL: https://build.opensuse.org/package/show/games/csmash?expand=0&rev=16 --- csmash.changes | 5 +++++ csmash.spec | 24 ++++++++---------------- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/csmash.changes b/csmash.changes index cf59dcb..5b39930 100644 --- a/csmash.changes +++ b/csmash.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu May 19 08:05:59 UTC 2022 - Jan Engelhardt + +- Build with to pkgconfig(sdl) so we can use sdl12_compat. + ------------------------------------------------------------------- Mon Jun 4 12:00:26 UTC 2018 - meissner@suse.com diff --git a/csmash.spec b/csmash.spec index 2352102..00edb96 100644 --- a/csmash.spec +++ b/csmash.spec @@ -1,7 +1,7 @@ # # spec file for package csmash # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -20,9 +20,9 @@ Name: csmash Version: 0.6.6 Release: 0 Summary: 3D Table Tennis Game -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Amusements/Games/3D/Other -Url: http://cannonsmash.sourceforge.net/ +URL: http://cannonsmash.sourceforge.net/ Source: %{name}-%{version}.tar.bz2 Source1: danslatristesse2-48.ogg Source2: %{name}.desktop @@ -32,7 +32,6 @@ Patch2: %{name}-%{version}-return_value.diff Patch3: %{name}-%{version}-qualification.diff Patch4: %{name}-%{version}-definitions.diff Patch5: %{name}-%{version}-uninitialized.diff -BuildRequires: SDL-devel BuildRequires: SDL_image-devel BuildRequires: SDL_mixer-devel BuildRequires: desktop-file-utils @@ -43,21 +42,15 @@ BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(glu) BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(gtk+-x11-2.0) +BuildRequires: pkgconfig(sdl) BuildRequires: pkgconfig(zlib) -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description CannonSmash is a 3D table tennis game. The goal of this project is to represent various table tennis strategies in a computer game. %prep -%setup -q -%patch0 -%patch1 -%patch2 -%patch3 -%patch4 -%patch5 +%autosetup -p0 mv README README.jp mv README.en README @@ -65,17 +58,16 @@ mv README.en README %configure \ --x-includes=%{_includedir} \ --x-libraries=%{_libdir} -make %{?_smp_mflags} AM_CFLAGS="%optflags" AM_CPPFLAGS="%optflags" +%make_build AM_CFLAGS="%optflags" AM_CPPFLAGS="%optflags" %install -make DESTDIR=%{buildroot} install +%make_install cp %{SOURCE1} %{buildroot}%{_datadir}/csmash %fdupes %{buildroot}%{_datadir} desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE2} %find_lang %{name} %files -f %{name}.lang -%defattr(-,root,root,755) %doc README README.jp AUTHORS COPYING CREDITS ChangeLog %{_bindir}/csmash %{_datadir}/csmash/