From ff089f2892024b98cd506a5453a0a07b403182711584c27952d1b670d0912734 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Thu, 18 Apr 2013 08:49:34 +0000 Subject: [PATCH] Accepting request 171355 from home:worldcitizen:branches:games Adapted the License according to the spdx standard OBS-URL: https://build.opensuse.org/request/show/171355 OBS-URL: https://build.opensuse.org/package/show/games/ltris?expand=0&rev=12 --- ltris.changes | 5 +++++ ltris.spec | 40 ++++++++++++++++++---------------------- 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/ltris.changes b/ltris.changes index 1cf8e47..407feb9 100644 --- a/ltris.changes +++ b/ltris.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Apr 18 06:45:11 UTC 2013 - joop.boonen@opensuse.org + +- Adapted the License according to the spdx standard + ------------------------------------------------------------------- Mon Oct 31 11:06:53 UTC 2011 - pascal.bleser@opensuse.org diff --git a/ltris.spec b/ltris.spec index 3c7f243..59ffea1 100644 --- a/ltris.spec +++ b/ltris.spec @@ -1,7 +1,7 @@ # # spec file for package ltris # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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 @@ -16,22 +16,23 @@ # - Name: ltris -BuildRequires: SDL_mixer-devel -%if 0%{?suse_version} -BuildRequires: fdupes update-desktop-files -%endif -License: GPL v2 or later -Group: Amusements/Games/Logic -Summary: Tetris Clone with Multiplayer and CPU Opponents Version: 1.0.18 -Release: 1 +Release: 0 +Summary: Tetris Clone with Multiplayer and CPU Opponents +License: GPL-2.0+ +Group: Amusements/Games/Logic Url: http://lgames.sourceforge.net/index.php?project=LTris # http://prdownloads.sourceforge.net/lgames/ltris-%{version}.tar.gz Source: ltris-%{version}.tar.bz2 Source1: %{name}.desktop +# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch1: ltris-no_system_wide_hiscore_file.patch +BuildRequires: SDL_mixer-devel +%if 0%{?suse_version} +BuildRequires: fdupes +BuildRequires: update-desktop-files +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -55,23 +56,19 @@ export CXXFLAGS="$CFLAGS" %configure \ --datadir=%{_datadir}/games \ --localstatedir=%{_localstatedir}/games - make %{?_smp_mflags} %install -%makeinstall - -install -m 0755 -d $RPM_BUILD_ROOT%{_datadir}/pixmaps/ -install -m 0644 icons/ltris48.xpm $RPM_BUILD_ROOT%{_datadir}/pixmaps/ltris.xpm -mv $RPM_BUILD_ROOT%{_datadir}/games/locale $RPM_BUILD_ROOT%{_datadir}/locale -%__rm -rf "$RPM_BUILD_ROOT%{_datadir}/games/applications" -%__rm -rf "$RPM_BUILD_ROOT%{_datadir}/games/icons" - +make DESTDIR=%{buildroot} install +install -m 0755 -d %{buildroot}%{_datadir}/pixmaps/ +install -m 0644 icons/ltris48.xpm %{buildroot}%{_datadir}/pixmaps/ltris.xpm +mv %{buildroot}%{_datadir}/games/locale %{buildroot}%{_datadir}/locale +rm -rf "%{buildroot}%{_datadir}/games/applications" +rm -rf "%{buildroot}%{_datadir}/games/icons" %if 0%{?suse_version} %suse_update_desktop_file -i %{name} Game ArcadeGame %endif %find_lang %{name} - %if 0%{?suse_version} %fdupes -s "%{buildroot}%{_datadir}/games/ltris" %endif @@ -80,8 +77,7 @@ mv $RPM_BUILD_ROOT%{_datadir}/games/locale $RPM_BUILD_ROOT%{_datadir}/locale %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog README %{_bindir}/ltris -%dir %{_datadir}/games/ltris -%{_datadir}/games/ltris/* +%{_datadir}/games/ltris/ %{_datadir}/applications/%{name}.desktop %{_datadir}/pixmaps/ltris.xpm