[uqm] 0.7.0.

Jon Ciesla limb at fedoraproject.org
Thu Nov 17 17:04:11 UTC 2011 

commit 8dd91c29be4de9d29af7c274f90abcd93c0425c4
Author: Jon Ciesla <limb at jcomserv.net>
Date:   Thu Nov 17 11:03:51 2011 -0600

    0.7.0.

 .gitignore         |    1 +
 sources            |    2 +-
 uqm-optflags.patch |   39 ++++++++++++++++-----------------
 uqm.autodlrc       |   61 +++++++++++++++++++++++++++++++++++++--------------
 uqm.spec           |   15 ++++++------
 5 files changed, 73 insertions(+), 45 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 884fdaf..fc3fb7e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 uqm-0.6.2-source.tgz
+/uqm-0.7.0-source.tgz
diff --git a/sources b/sources
index 7842137..6b1e23e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ba4ee595b62349873d510b9827e7648d  uqm-0.6.2-source.tgz
+f9018ea0493d7dac6a9e1006b00af7df  uqm-0.7.0-source.tgz
diff --git a/uqm-optflags.patch b/uqm-optflags.patch
index 061fde5..81d7970 100644
--- a/uqm-optflags.patch
+++ b/uqm-optflags.patch
@@ -1,21 +1,20 @@
-diff -up sc2/build/unix/build.config.orig sc2/build/unix/build.config
---- sc2/build/unix/build.config.orig	2006-12-23 05:26:16.000000000 -0500
-+++ sc2/build/unix/build.config	2008-09-10 11:03:12.000000000 -0400
-@@ -90,7 +90,7 @@ uqm_prepare_config()
- 	CHOICE_debug_OPTION_nodebug_TITLE="Optimised release build"
- 	CHOICE_debug_OPTION_nodebug_ACTION='nodebug_action'
- 	nodebug_action() {
--		CFLAGS="$CFLAGS -O3"
-+		CFLAGS="$CFLAGS $RPM_OPT_FLAGS"
+--- build/unix/build.config~	2011-07-04 12:45:34.000000000 -0400
++++ build/unix/build.config	2011-11-04 16:14:47.645731689 -0400
+@@ -117,7 +117,7 @@
+ 				CFLAGS="$CFLAGS -O3 -DNDEBUG"
+ 				;;				
+ 			*)
+-				CFLAGS="$CFLAGS -O3 -DNDEBUG"
++				CFLAGS="$CFLAGS $RPM_OPT_FLAGS"
+ 				;;	
+ 		esac	
  		DEBUG=0
- 	}
- 	CHOICE_debug_OPTION_debug_TITLE="Debugging build"
-@@ -131,7 +131,7 @@ uqm_prepare_config()
- 				# for more readable messages.
- 		DEBUG=1
- 	}
--	CHOICE_debug_DEFAULT=debug
-+	CHOICE_debug_DEFAULT=nodebug
- 
- 	CHOICE_graphics_OPTIONS="pure opengl"
- 	CHOICE_graphics_TITLE="OpenGL graphics support"
+@@ -189,7 +189,7 @@
+ 			CHOICE_debug_DEFAULT=nodebug
+ 			;;
+ 		*)
+-			CHOICE_debug_DEFAULT=debug
++			CHOICE_debug_DEFAULT=nodebug
+ 			;;
+ 	esac
+ 	
diff --git a/uqm.autodlrc b/uqm.autodlrc
index 69ccc6e..33a5838 100644
--- a/uqm.autodlrc
+++ b/uqm.autodlrc
@@ -52,33 +52,60 @@ http://creativecommons.org/licenses/by-nc-sa/2.5/legalcode
 
 [FILELIST]
 [FILE]
-	[FILENAME]uqm-0.6.0-content.uqm[/FILENAME]
-	[MD5]7e8f0ed8490e24231431420ea2ba6a03[/MD5]
+	[FILENAME]uqm-0.7.0-content.uqm[/FILENAME]
+	[MD5]2f36dcb15274dbbcb5e266f2ed84d5b2[/MD5]
 	[PATH]$HOME/.uqm/content/packages[/PATH]
 	[MIRRORS]
-		[URL]http://sourceforge.net/projects/sc2/files/UQM/0.6/uqm-0.6.0-content.uqm/download[/URL]
-		[URL]http://sourceforge.net/projects/sc2/files/UQM/0.6/uqm-0.6.0-content.uqm/download[/URL]
-		[URL]http://sourceforge.net/projects/sc2/files/UQM/0.6/uqm-0.6.0-content.uqm/download[/URL]
+		[URL]http://sourceforge.net/projects/sc2/files/UQM/0.7/uqm-0.7.0-content.uqm/download[/URL]
+		[URL]http://sourceforge.net/projects/sc2/files/UQM/0.7/uqm-0.7.0-content.uqm/download[/URL]
+		[URL]http://sourceforge.net/projects/sc2/files/UQM/0.7/uqm-0.7.0-content.uqm/download[/URL]
 	[/MIRRORS]
 [/FILE]
 [FILE]
-	[FILENAME]uqm-0.6.0-voice.uqm[/FILENAME]
-	[MD5]d31577b896be935cc2238afd07299b8b[/MD5]
-	[PATH]$HOME/.uqm/content/packages[/PATH]
+	[FILENAME]uqm-0.7.0-voice.uqm[/FILENAME]
+	[MD5]b78e0606325810f9f2e9ec786191c01b[/MD5]
+	[PATH]$HOME/.uqm/content/packages/addons[/PATH]
 	[MIRRORS]
-		[URL]http://sourceforge.net/projects/sc2/files/UQM/0.6/uqm-0.6.0-voice.uqm/download[/URL]
-		[URL]http://sourceforge.net/projects/sc2/files/UQM/0.6/uqm-0.6.0-voice.uqm/download[/URL]
-		[URL]http://sourceforge.net/projects/sc2/files/UQM/0.6/uqm-0.6.0-voice.uqm/download[/URL]
+		[URL]http://sourceforge.net/projects/sc2/files/UQM/0.7/uqm-0.7.0-voice.uqm/download[/URL]
+		[URL]http://sourceforge.net/projects/sc2/files/UQM/0.7/uqm-0.7.0-voice.uqm/download[/URL]
+		[URL]http://sourceforge.net/projects/sc2/files/UQM/0.7/uqm-0.7.0-voice.uqm/download[/URL]
 	[/MIRRORS]
 [/FILE]
 [FILE]
-	[FILENAME]uqm-0.6.0-3domusic.uqm[/FILENAME]
-	[MD5]a20cacc8e66f5ff1fdf5e1d3a3b93fd2[/MD5]
-	[PATH]$HOME/.uqm/content/packages[/PATH]
+	[FILENAME]uqm-0.7.0-3domusic.uqm[/FILENAME]
+	[MD5]86a5e376d9b76888add1d10818f0ab9f[/MD5]
+	[PATH]$HOME/.uqm/content/packages/addons[/PATH]
 	[MIRRORS]
-		[URL]http://sourceforge.net/projects/sc2/files/UQM/0.6/uqm-0.6.0-3domusic.uqm/download[/URL]
-		[URL]http://sourceforge.net/projects/sc2/files/UQM/0.6/uqm-0.6.0-3domusic.uqm/download[/URL]
-		[URL]http://sourceforge.net/projects/sc2/files/UQM/0.6/uqm-0.6.0-3domusic.uqm/download[/URL]
+		[URL]http://sourceforge.net/projects/sc2/files/UQM/0.7/uqm-0.7.0-3domusic.uqm/download[/URL]
+		[URL]http://sourceforge.net/projects/sc2/files/UQM/0.7/uqm-0.7.0-3domusic.uqm/download[/URL]
+		[URL]http://sourceforge.net/projects/sc2/files/UQM/0.7/uqm-0.7.0-3domusic.uqm/download[/URL]
 	[/MIRRORS]
 [/FILE]
+[FILE]
+	[FILENAME]uqm-remix-pack1.uqm[/FILENAME]
+	[MD5]09f242d8d72166d1d5ccbd3d99c93e7d[/MD5]
+	[PATH]$HOME/.uqm/content/addons[/PATH]
+	[MIRRORS]
+		[URL]http://prdownloads.sourceforge.net/sc2/uqm-remix-disc1.uqm?download[/URL]
+	[/MIRRORS]
+[/FILE]
+[FILE]
+	[FILENAME]uqm-remix-pack2.uqm[/FILENAME]
+	[MD5]fbc8bdcb709939d559d8c7216ad15cc2[/MD5]
+	[PATH]$HOME/.uqm/content/addons[/PATH]
+	[MIRRORS]
+		[URL]http://prdownloads.sourceforge.net/sc2/uqm-remix-disc2.uqm?download[/URL]
+	[/MIRRORS]
+[/FILE]
+[FILE]
+	[FILENAME]uqm-remix-pack3.uqm[/FILENAME]
+	[MD5]5ccc6d4ac301ae98e172ac6835dcdead[/MD5]
+	[PATH]$HOME/.uqm/content/addons[/PATH]
+	[MIRRORS]
+		[URL]http://prdownloads.sourceforge.net/sc2/uqm-remix-disc3.uqm?download[/URL]
+	[/MIRRORS]
+[/FILE]
+
+
+
 [/FILELIST]
diff --git a/uqm.spec b/uqm.spec
index afadaad..6d27bfd 100644
--- a/uqm.spec
+++ b/uqm.spec
@@ -1,6 +1,6 @@
 Name:           uqm
-Version:        0.6.2
-Release:        12%{?dist}
+Version:        0.7.0
+Release:        1%{?dist}
 Summary:        The Ur-Quan Masters, a port of the classic game Star Control II
 
 Group:          Amusements/Games
@@ -46,7 +46,6 @@ find -type d -name CVS -exec rm -rf {} ';'
 
 
 %build
-pushd sc2
 echo INPUT_install_sharedir_VALUE=%{_datadir} > config.state
 sed -i 's|@CONTENTDIR@|~/.uqm|g' src/config_unix.h.in
 sh ./build.sh uqm < /dev/null
@@ -54,7 +53,6 @@ convert src/res/ur-quan-icon-std.ico uqm.png
 
 
 %install
-pushd sc2
 rm -rf $RPM_BUILD_ROOT
 
 install -dm 755 $RPM_BUILD_ROOT{%{_sysconfdir},%{_bindir}}
@@ -68,7 +66,7 @@ chmod 755 $RPM_BUILD_ROOT%{_bindir}/uqm
 install -Dpm 755 uqm $RPM_BUILD_ROOT%{_prefix}/games/uqm
 
 install -dm 755 \
-  $RPM_BUILD_ROOT%{_datadir}/uqm/content/packages/addons/uqmremix
+  $RPM_BUILD_ROOT%{_datadir}/uqm/content/packages/addons
 echo %{version} > $RPM_BUILD_ROOT%{_datadir}/uqm/content/version
 
 desktop-file-install \
@@ -89,8 +87,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc sc2/AUTHORS sc2/ChangeLog sc2/Contributing sc2/COPYING sc2/README 
-%doc sc2/WhatsNew sc2/doc/users/manual.txt
+%doc AUTHORS ChangeLog Contributing COPYING README 
+%doc WhatsNew doc/users/manual.txt
 %config(noreplace) %{_sysconfdir}/uqm.conf
 %{_bindir}/uqm
 %{_prefix}/games/uqm
@@ -100,6 +98,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Nov 17 2011 Jon Ciesla <limb at jcomserv.net> - 0.7.0-1
+- Updated to 0.7.0 release based on Solomon Peachy's changes from BZ 735956.
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.2-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild

More information about the scm-commits mailing list