From 3d7e476d9981c68042726b9aefc9f077c45fb4d6 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Aug 16 2013 15:21:52 +0000 Subject: fix license text, resolves bz 888201 --- diff --git a/alienarena-license-fix.patch b/alienarena-license-fix.patch new file mode 100644 index 0000000..bc329e0 --- /dev/null +++ b/alienarena-license-fix.patch @@ -0,0 +1,19 @@ +--- trunk/docs/README.txt 2012/07/23 06:22:33 3061 ++++ trunk/docs/README.txt 2013/05/15 04:32:01 3563 +@@ -154,14 +154,14 @@ + + The included TrueType fonts (FreeSans and FreeMono) are from the GNU FreeFont package (http://www.gnu.org/software/freefont/); they are free software distributed under the terms of the GNU General Public License version 3 (http://www.gnu.org/licenses/gpl.html). + +-It is only permissible to distribute the game data (models, maps, textures, sound, etc) as a whole, and with the intention of being used with Alien Arena. It is not permissible to distribute individual portions or items of the game data without express consent from COR Entertainment. ++Permission is granted to freely distribute (without restriction) the game data(models, maps, textures, sound, etc) as a whole, and with the intention of being used with Alien Arena. However, it is not permissible to distribute, sell, or use for profit individual portions or items of the game data without express consent from COR Entertainment. + + 'rcon' and 'svstat' ruby scripts are Copyright (C) 2009 Tony Jackson and Licensed under the GNU Lesser General Public License + + The Debian packaging is (C) 2009, Andres Mejia and + is licensed under the GPL, see `/usr/share/common-licenses/GPL'. + +-Under no circumstances ALIEN ARENA as a whole be sold or used for profit, without express consent from COR Entertainment. ALIEN ARENA may be included in free compilation CD's and similar packages without consent, provided it adheres to the above restrictions. ++ALIEN ARENA may be included in free compilation CD's and similar packages without consent, provided it adheres to the above restrictions. + + Contact: http://red.planetarena.org + diff --git a/alienarena.spec b/alienarena.spec index 79480d2..205a18b 100644 --- a/alienarena.spec +++ b/alienarena.spec @@ -1,7 +1,7 @@ Name: alienarena Summary: Multiplayer retro sci-fi deathmatch game Version: 7.65 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: Amusements/Games Source0: http://red.planetarena.org/files/%{name}-%{version}-linux20130207.tar.gz @@ -9,6 +9,9 @@ Source1: %{name}.desktop Source2: GPL.acebot.txt Patch3: alienarena-7.45-no-qglBlitFramebufferEXT.patch Patch5: alienarena-7.52-system-ode-double.patch +# License fix applied upstream +# http://svn.icculus.org/alienarena/trunk/docs/README.txt?r1=3061&r2=3563&view=patch +Patch6: alienarena-license-fix.patch URL: http://red.planetarena.org/ BuildRequires: libX11-devel, libXext-devel, libXxf86vm-devel, libjpeg-devel BuildRequires: mesa-libGL-devel, mesa-libGLU-devel, curl-devel, libpng-devel @@ -56,6 +59,7 @@ This is the game data. %patch3 -p1 -b .no-qglBlitFramebufferEXT %patch5 -p1 -b .ode-double +%patch6 -p1 -b .license-fix # We don't want the bundled ode code. rm -rf source/unix/ode @@ -117,6 +121,9 @@ gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2>/dev/null || : %{_datadir}/%{name} %changelog +* Fri Aug 16 2013 Tom Callaway - 7.65-4 +- fix license text (bz 888201) + * Sat Aug 03 2013 Fedora Release Engineering - 7.65-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index bebc645..085c8a8 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -1e32455d8f6418c92b1b6f4d54becadd alienarena-7.60.1-linux20120823.tar.gz a8f67eb484705588ca5d8101413669d2 alienarena-7.65-linux20130207.tar.gz