[astromenace: 1/2] 1.3.1.

Wed Apr 3 18:44:09 UTC 2013

commit 5e262672a5767dbe494eea838df1ca805ad8b424
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Wed Apr 3 13:39:19 2013 -0500

    1.3.1.

 .gitignore                       |    1 +
 astromenace-1.3.1-fontless.patch |   31 +++++++++++++++++++++++++
 astromenace-programmdir.patch    |   29 ++++++++---------------
 astromenace.spec                 |   47 ++++++++++++++++++++++---------------
 sources                          |    2 +-
 5 files changed, 71 insertions(+), 39 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index dce76e5..7492102 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 AstroMenaceSourceCode_080519-clean.tar.xz
+/astromenace-src-fontless-1.3.1.tar.bz2
diff --git a/astromenace-1.3.1-fontless.patch b/astromenace-1.3.1-fontless.patch
new file mode 100644
index 0000000..08af7a0
--- /dev/null
+++ b/astromenace-1.3.1-fontless.patch
@@ -0,0 +1,31 @@
+--- AstroMenaceSource/Main.cpp~	2012-12-13 13:12:56.000000000 -0600
++++ AstroMenaceSource/Main.cpp	2013-04-03 11:56:45.641776722 -0500
+@@ -46,7 +46,6 @@
+ 
+ sFontList FontList[FontQuantity] =
+ {
+-{"Ubuntu Family", "DATA/FONT/Ubuntu-B.ttf"},
+ {"Liberation Mono", "DATA/FONT/LiberationMono-Bold.ttf"},
+ {"Liberation Sans", "DATA/FONT/LiberationSans-Bold.ttf"},
+ {"Liberation Serif", "DATA/FONT/LiberationSerif-Bold.ttf"},
+--- AstroMenaceSource/MainFS2VFS.cpp~	2012-12-07 09:55:58.000000000 -0600
++++ AstroMenaceSource/MainFS2VFS.cpp	2013-04-03 11:56:28.117777113 -0500
+@@ -400,7 +400,6 @@
+ "FONT/FreeMonoBold.ttf",
+ "FONT/FreeSansBold.ttf",
+ "FONT/FreeSerifBold.ttf",
+-"FONT/Ubuntu-B.ttf",
+ "CREDITS/freetype.tga",
+ "CREDITS/oggvorbis.tga",
+ "text.csv",
+--- AstroMenaceSource/MainFS2VFS.cpp~	2013-04-03 11:59:37.000000000 -0500
++++ AstroMenaceSource/MainFS2VFS.cpp	2013-04-03 12:04:20.075766582 -0500
+@@ -28,7 +28,7 @@
+ #include "Game.h"
+ 
+ 
+-const int	ConvertListCount = 387;
++const int	ConvertListCount = 386;
+ const char *ConvertList[ConvertListCount] =
+ {"DATA_RU/VOICE/EngineMalfunction.wav",
+ "DATA_RU/VOICE/WeaponDamaged.wav",
diff --git a/astromenace-programmdir.patch b/astromenace-programmdir.patch
index 8647a86..87098ca 100644
--- a/astromenace-programmdir.patch
+++ b/astromenace-programmdir.patch
@@ -1,20 +1,11 @@
---- AstroMenaceSource/Main.cpp	2008-06-06 12:31:13.000000000 -0500
-+++ AstroMenaceSource/Main.cpp	2008-06-06 12:31:13.000000000 -0500
-@@ -337,11 +337,12 @@
- #ifdef DATADIR
- 		strcpy(ProgrammDir, DATADIR "/");
- #else
-- 		strcpy(ProgrammDir, argv[0]);
-- 		char* s = strrchr(ProgrammDir,'/');
-- 		if (s) s[0]=0x0;
-- 		const char *Fi = "/";
-- 		strcat( ProgrammDir, Fi );
-+		strncat(ProgrammDir, "/usr/share/astromenace/", strlen("/usr/share/astromenace/"));
-+ 		//strcpy(ProgrammDir, argv[0]);
-+ 		//char* s = strrchr(ProgrammDir,'/');
-+ 		//if (s) s[0]=0x0;
-+ 		//const char *Fi = "/";
-+ 		//strcat( ProgrammDir, Fi );
- #endif
- 	}
+--- AstroMenaceSource/config.h~	2012-12-13 13:12:56.000000000 -0600
++++ AstroMenaceSource/config.h	2013-01-16 06:02:12.722155282 -0600
+@@ -58,7 +58,7 @@
+ // #define compression
  
+ // define DATADIR with gamedata.vfs file location if you don't put it together in the same directory with binary file
+-// #define DATADIR "/usr/share/astromenace"
++#define DATADIR "/usr/share/astromenace"
+ 
+ // game configuration file will be stored with game binary file
+ // #define portable
diff --git a/astromenace.spec b/astromenace.spec
index cdb7e2d..67d11da 100644
--- a/astromenace.spec
+++ b/astromenace.spec
@@ -1,30 +1,29 @@
 Name: astromenace
-Version:  1.2
-Release:  18%{?dist}
+Version:  1.3.1
+Release:  1%{?dist}
 Summary: Hardcore 3D space shooter with spaceship upgrade possibilities  
 
 Group: Amusements/Games 
 License: GPLv3
 URL: http://www.viewizard.com/
-# This is http://www.viewizard.com/download/AstroMenaceSourceCode_080519.zip
-# With the non Free (SGI Free Software License B) licensed:
-# AstroMenaceSource/Core/RendererInterface/GLext.h
-# file removed, instead we use the freely licensed system version
-Source0: AstroMenaceSourceCode_080519-clean.tar.xz
+# this is the Sourceforge source with RAW_VFS_DATA/FONTS/Ubuntu* removed, they
+# use the non-free Ubuntu Font License 1.0
+Source0: astromenace-src-fontless-1.3.1.tar.bz2
 Source1: astromenace.desktop
 Source2: astromenace.png
-Patch0: astromenace-langvfs.patch
-Patch1: astromenace-640x480.patch
+#Patch0: astromenace-langvfs.patch
+#Patch1: astromenace-640x480.patch
 Patch2: astromenace-programmdir.patch
-# Use system glext.h and work around bug 517959
-Patch3: astromenace-system-glext.patch
 Patch4: astromenace-level2-crash.patch
+Patch5: astromenace-1.3.1-fontless.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
 BuildRequires: cmake, SDL-devel, libogg-devel
 BuildRequires: libvorbis-devel, libjpeg-devel, desktop-file-utils
 BuildRequires: openal-soft-devel freealut-devel >= 1.1.0-10
-Requires: astromenace-data = %{version}, opengl-games-utils
+Obsoletes: astromenace-data <= %{version}-%{release}
+Provides: astromenace-data = %{version}-%{release}
+Requires: opengl-games-utils
 
 %description
 Space is a vast area, an unbounded territory where it seems there is a 
@@ -37,7 +36,7 @@ invaders chose the wrong galaxy to conquer and you are to prove it!
 Go ahead and make alien aggressors regret their insolence.
 
 %prep
-%setup -qn AstroMenaceSourceCode
+%setup -qn AstroMenace
 
 sed -i 's/\r//' License.txt
 sed -i 's/\r//' gpl-3.0.txt
@@ -45,22 +44,25 @@ chmod -x License.txt
 chmod -x ReadMe.txt
 chmod -x gpl-3.0.txt
 
-%patch0 -p0
-%patch1 -p1
+#%patch0 -p0
+#%patch1 -p1
 %patch2 -p0
-%patch3 -p1
 %patch4 -p1
+%patch5 -p0
 
 %build
 %cmake .
 make %{?_smp_mflags}
 
+./AstroMenace --pack --rawdata=./RAW_VFS_DATA --dir=./
+
 %install
 rm -rf %{buildroot}
 mkdir -p  %{buildroot}%{_bindir}
 install -m 755 AstroMenace %{buildroot}%{_bindir}/astromenace
-
-desktop-file-install --vendor fedora            \
+mkdir -p %{buildroot}%{_datadir}/astromenace
+install -m 644 gamedata.vfs %{buildroot}%{_datadir}/astromenace/
+desktop-file-install \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   %{SOURCE1}
 
@@ -91,10 +93,17 @@ rm -rf %{buildroot}
 %{_bindir}/astromenace
 %{_bindir}/%{name}-wrapper
 %doc ReadMe.txt License.txt gpl-3.0.txt
-%{_datadir}/applications/fedora-astromenace.desktop
+%{_datadir}/applications/astromenace.desktop
 %{_datadir}/icons/hicolor/64x64/apps/astromenace.png
+%{_datadir}/astromenace/
 
 %changelog
+* Thu Mar 21 2013 Jon Ciesla <limburgher at gmail.com> - 1.3.1-1
+- 1.3.1.
+- Drop desktop vendor tag.
+- Obsolete/provide -data.
+- Using modified tarball and patch to avoid Ubuntu Font License, non-free.
+
 * Fri Dec 21 2012 Adam Tkac <atkac redhat com> - 1.2-18
 - rebuild against new libjpeg
 
diff --git a/sources b/sources
index 170e78e..dc5931b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a3d6fb8b24fb10cd9536fd934cec3194  AstroMenaceSourceCode_080519-clean.tar.xz
+a3f1ff456e130b100002c83f55c6e7e4  astromenace-src-fontless-1.3.1.tar.bz2
