rpms/Maelstrom/F-12 Maelstrom-3.0.6-DESTDIR.patch, NONE, 1.1 Maelstrom-Content-License.txt, NONE, 1.1 Maelstrom.spec, 1.22, 1.23

Sun Dec 6 22:43:50 UTC 2009

Author: spot

Update of /cvs/pkgs/rpms/Maelstrom/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19865/F-12

Modified Files:
	Maelstrom.spec 
Added Files:
	Maelstrom-3.0.6-DESTDIR.patch Maelstrom-Content-License.txt 
Log Message:
revive dead package

Maelstrom-3.0.6-DESTDIR.patch:
 Makefile.am |    2 +-
 Makefile.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE Maelstrom-3.0.6-DESTDIR.patch ---
diff -up Maelstrom-3.0.6/Makefile.am.BAD Maelstrom-3.0.6/Makefile.am
--- Maelstrom-3.0.6/Makefile.am.BAD	2009-12-06 17:37:05.042119272 -0500
+++ Maelstrom-3.0.6/Makefile.am	2009-12-06 17:37:39.040120370 -0500
@@ -65,7 +65,7 @@ DIST_SUBDIRS = $(SUBDIRS) Images Docs
 
 # Special install rule for the game
 install:
-	make install_gamedata target=@GAME_INSTALLDIR@
+	make install_gamedata target=$(DESTDIR)@GAME_INSTALLDIR@
 
 install_gamedata:
 	sh mkinstalldirs $(target)/
diff -up Maelstrom-3.0.6/Makefile.in.BAD Maelstrom-3.0.6/Makefile.in
--- Maelstrom-3.0.6/Makefile.in.BAD	2009-12-06 17:37:58.555119622 -0500
+++ Maelstrom-3.0.6/Makefile.in	2009-12-06 17:38:04.208119720 -0500
@@ -431,7 +431,7 @@ maintainer-clean-generic clean mostlycle
 
 # Special install rule for the game
 install:
-	make install_gamedata target=@GAME_INSTALLDIR@
+	make install_gamedata target=$(DESTDIR)@GAME_INSTALLDIR@
 
 install_gamedata:
 	sh mkinstalldirs $(target)/


--- NEW FILE Maelstrom-Content-License.txt ---
*****
On Tuesday, November 17, 2009, the copyright holders for the artwork and 
animations in Maelstrom (Mark Lewis, Ian Gilman, and Andrew Welch) all 
agreed to relicense their contributions under the terms of the Creative Commons
Attribution 3.0 License (unported).

http://creativecommons.org/licenses/by/3.0/legalcode

Their permissions are recorded below, as plaintext copies of email sent to 
Tom Callaway.

*****

Subject: Fwd: My permissions:
From: Mark Lewis <markwlewis at cox.net>
Date: Tue, 17 Nov 2009 14:12:07 -0800
To: Tom spot Callaway <tcallawa at redhat.com>

From: Mark Lewis <markwlewis at cox.net>
Date: November 17, 2009 2:08:57 PM PST
To: Andrew_Welch <andrew at AmbrosiaSW.com>
Subject: My permissions:

I explicitly give permission for the artwork created by me within =
Maelstrom to be used under the terms of the Creative Commons Attribution =
3.0 license (unported):

Signed:

Mark W. Lewis
5 Harveston
Mission Viejo, CA 92692
markwlewis at cox.net

From: Ian Gilman <ian at iangilman.com>
Subject: Re: License on art/sounds for Maelstrom
Date: Tue, 17 Nov 2009 21:15:55 -0800
To: andrew welch <andrew at AmbrosiaSW.com>,
        Tom spot Callaway <tcallawa at redhat.com>,
        Mark Lewis <markwlewis at cox.net>, slouken at gmail.com

I explicitly give permission for the artwork and animations in Maelstrom =
to be used under the terms of the Creative Commons Attribution 3.0 =
license (unported):

http://creativecommons.org/licenses/by/3.0/legalcode

-- Ian Gilman
-- digital renaissance man
-- www.iangilman.com=

Cc: Mark Lewis <markwlewis at cox.net>, slouken at gmail.com,
        Ian Gilman <ian at iangilman.com>
From: Andrew Welch <andrew at AmbrosiaSW.com>
To: "Tom \"spot\" Callaway" <tcallawa at redhat.com>
Subject: Re: License on art/sounds for Maelstrom
Date: Tue, 17 Nov 2009 15:59:37 -0500

I explicitly give permission for the artwork and sounds in Maelstrom
to be used under the terms of the Creative Commons Attribution 3.0
license (unported):

http://creativecommons.org/licenses/by/3.0/legalcode

Andrew Welch / el Presidente / Ambrosia Software, Inc. -- http://www.AmbrosiaSW.com/



Index: Maelstrom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Maelstrom/F-12/Maelstrom.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- Maelstrom.spec	24 Jul 2009 15:37:19 -0000	1.22
+++ Maelstrom.spec	6 Dec 2009 22:43:49 -0000	1.23
@@ -1,67 +1,66 @@
-Summary: Space combat game
-Name: Maelstrom
-Version: 3.0.6
-Release: 18
-License: GPLv2+
-Group: Amusements/Games
-Source0: http://www.devolution.com/~slouken/Maelstrom/src/Maelstrom-%{version}.tar.gz
-Source1: maelstrom.png
-Source2: Maelstrom.desktop
-Patch0: Maelstrom-3.0.6-setgid.patch
-Patch1: Maelstrom-3.0.6-gcc34.patch
-Patch2: Maelstrom-3.0.6-64bit.patch
-Patch3: Maelstrom-3.0.6-install.patch
-Patch4: Maelstrom-open.patch
-URL:       http://www.devolution.com/~slouken/Maelstrom/
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: SDL_net-devel, desktop-file-utils, libtool
-Requires(post): coreutils
-Requires(postun): coreutils
+Name:			Maelstrom
+Summary:		A space combat game
+Version:		3.0.6
+Release:		19%{?dist}
+# See Maelstrom-Content-License.txt for details on the updated content licensing
+License:		GPLv2+ and CC-BY
+Group:			Amusements/Games
+Source0:		http://www.devolution.com/~slouken/Maelstrom/src/Maelstrom-%{version}.tar.gz
+Source1:		maelstrom.png
+Source2:		Maelstrom.desktop
+Source3:		Maelstrom-Content-License.txt
+Patch0:			Maelstrom-3.0.6-setgid.patch
+Patch1:			Maelstrom-3.0.6-gcc34.patch
+Patch2:			Maelstrom-3.0.6-64bit.patch
+Patch3:			Maelstrom-3.0.6-install.patch
+Patch4:			Maelstrom-open.patch
+Patch5:			Maelstrom-3.0.6-DESTDIR.patch
+URL:			http://www.devolution.com/~slouken/Maelstrom/
+BuildRequires:		SDL_net-devel, desktop-file-utils, libtool
+Requires(post):		coreutils
+Requires(postun):	coreutils
 
 %description
-Maelstrom is a space combat game, originally ported from the Macintosh
-platform. Brave pilots get to dodge asteroids and fight off other
-ships at the same time.
+Maelstrom is a space combat game, originally ported from the Macintosh 
+platform. Brave pilots get to dodge asteroids and fight off other ships 
+at the same time.
 
 %prep
-
 %setup -q
 %patch0 -p1 -b .setgid
 %patch1 -p1 -b .gcc34
 %patch2 -p1 -b .64bit
 %patch3 -p1 -b .install
 %patch4 -p1 -b .open
+%patch5 -p1 -b .destdir
+cp %{SOURCE3} .
 
 %build
-cp /usr/share/libtool/config/config.{sub,guess} .
+cp %{_datadir}/libtool/config/config.{sub,guess} .
 %configure
-
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-%makeinstall
-
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+make DESTDIR=%{buildroot} install
 
+mkdir -p %{buildroot}%{_datadir}/applications
 desktop-file-install --vendor fedora --dir \
-	$RPM_BUILD_ROOT%{_datadir}/applications \
-	--add-category X-Fedora %{SOURCE2}
+	%{buildroot}%{_datadir}/applications \
+	%{SOURCE2}
 
 # remove unpackaged files from the buildroot
-rm -f $RPM_BUILD_ROOT%{_bindir}/{Maelstrom-netd,macres,playwave,snd2wav}
-
-mkdir -p -m 755 $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps
+rm -f %{buildroot}%{_bindir}/{Maelstrom-netd,macres,playwave,snd2wav}
 
-install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps
+mkdir -p -m 755 %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
+install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
 
-mkdir -p -m 755 $RPM_BUILD_ROOT%{_localstatedir}/lib/games
-mv $RPM_BUILD_ROOT%{_datadir}/Maelstrom/*Scores $RPM_BUILD_ROOT%{_localstatedir}/lib/games
+mkdir -p -m 755 %{buildroot}%{_localstatedir}/lib/games
+mv %{buildroot}%{_datadir}/Maelstrom/*Scores %{buildroot}%{_localstatedir}/lib/games
 
-find $RPM_BUILD_ROOT -name "Makefile*" -exec rm -f {} \;
+find %{buildroot} -name "Makefile*" -exec rm -f {} \;
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
@@ -74,11 +73,12 @@ touch --no-create /usr/share/icons/hicol
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
   gtk-update-icon-cache -q /usr/share/icons/hicolor
 fi
-  
+
 
 %files
-%defattr(-, root, root)
+%defattr(-, root, root, -)
 %doc COPYING* CREDITS README* Changelog Docs
+%doc Maelstrom-Content-License.txt
 %attr(2755,root,games) %{_bindir}/Maelstrom
 %{_datadir}/Maelstrom
 %{_datadir}/applications/*
@@ -86,6 +86,9 @@ fi
 %config(noreplace) %attr(0664,root,games) %{_localstatedir}/lib/games/Maelstrom-Scores
 
 %changelog
+* Sun Dec  6 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 3.0.6-19
+- Revived and cleaned up, license issues resolved
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.6-18
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -132,7 +135,7 @@ fi
 - make some files again owned by root
 
 * Tue Mar 23 2004 Bill Nottingham <notting at redhat.com> 3.0.6-3
-- make score file %config (#108386)
+- make score file %%config (#108386)
 - move icon (#111583)
 
 * Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
@@ -234,7 +237,7 @@ fi
 - changed to valid group
 
 * Wed Dec  8 1999 Bill Nottingham <notting at redhat.com>
-- don't echo in %pre/%post, don't add desktop entries to $HOME
+- don't echo in %%pre/%%post, don't add desktop entries to $HOME
 
 * Tue Sep 21 1999 Sam Lantinga <slouken at devolution.com>
 


