rpms/uqm/devel uqm-functions.sh, NONE, 1.1 uqm.autodlrc, NONE, 1.1 uqm-optflags.patch, 1.3, 1.4 uqm.desktop, 1.2, 1.3 uqm.sh, 1.1, 1.2 uqm.spec, 1.15, 1.16

Tom Callaway spot at fedoraproject.org
Thu Sep 11 04:49:43 UTC 2008 

Author: spot

Update of /cvs/pkgs/rpms/uqm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1157

Modified Files:
	uqm-optflags.patch uqm.desktop uqm.sh uqm.spec 
Added Files:
	uqm-functions.sh uqm.autodlrc 
Log Message:
migrate to autodownloader


--- NEW FILE uqm-functions.sh ---
# creates a local working directory in user-home
function createLocalDir ()
{
  if [ ! -f $myHomeDir/uqm-0.6.2 ]; then
    echo "creating local working directory $myHomeDir ..."
    set +e
    /usr/share/autodl/AutoDL.py $myShareDir/uqm.autodlrc
    STATUS=$?
    set -e
    # status 2 means download was ok, but the user choose not to start the game
    if [ "$STATUS" = "0" -o  "$STATUS" = "2" ]; then
      cd $myHomeDir/content/
      if [ ! -f ./version ]; then
        ln -s $myShareDir/content/version version
      fi
      cd packages/
      if [ ! -f ./addons ]; then
        ln -s $myShareDir/content/packages/addons addons
      fi
      # Signal succesful datafiles installation
      cd ../..
      touch uqm-0.6.2
    fi

    if [ "$STATUS" != "0" ]; then
      exit $STATUS
    fi
  fi
}


--- NEW FILE uqm.autodlrc ---
[MESSAGELIST]
[MESSAGE]
	[TITLE]Please click 'Accept' to allow internet access.[/TITLE]
	[TEXT]In order to play Ur-Quan Masters, the uqm data files are needed.

These files are not included in Fedora because they are licensed under the Creative Commons Attribution-NonCommercial-ShareAlike 2.5 License, which contains a no commercial use clause. These files can be freely downloaded from the internet.

If you click Accept the necessary files will be automatically downloaded and installed for you.

Please click Accept to allow access to the internet to download the necessary datafiles.[/TEXT]
[/MESSAGE]
[MESSAGE]
	[TITLE]License Information[/TITLE]
	[TEXT]Attribution-NonCommercial-ShareAlike 2.5 License

You are free:

 * to Share — to copy, distribute and transmit
   the work
 * to Remix — to adapt the work

Under the following conditions:

 * Attribution. You must attribute the work in the
   manner specified by the author or licensor (but
   not in any way that suggests that they endorse
   you or your use of the work).
 * Noncommercial. You may not use this work for
   commercial purposes.
 * Share Alike. If you alter, transform, or build
   upon this work, you may distribute the resulting
   work only under the same or similar license to
   this one.

 * For any reuse or distribution, you must make clear
   to others the license terms of this work. The best
   way to do this is with a link to this web page.
 * Any of the above conditions can be waived if you
   get permission from the copyright holder.
 * Nothing in this license impairs or restricts the
   author's moral rights.

Disclaimer

Your fair dealing and other rights are in no way affected by the above.

This is a human-readable summary of the Legal Code (the full license), which is available here:
http://creativecommons.org/licenses/by-nc-sa/2.5/legalcode
[/TEXT]
[/MESSAGE]
[/MESSAGELIST]

[FILELIST]
[FILE]
	[FILENAME]uqm-0.6.0-content.uqm[/FILENAME]
	[MD5]7e8f0ed8490e24231431420ea2ba6a03[/MD5]
	[PATH]$HOME/.uqm/content/packages[/PATH]
	[MIRRORS]
		[URL]http://download.sourceforge.net/sc2/uqm-0.6.0-content.uqm[/URL]
		[URL]http://download.sourceforge.net/sc2/uqm-0.6.0-content.uqm[/URL]
		[URL]http://download.sourceforge.net/sc2/uqm-0.6.0-content.uqm[/URL]
	[/MIRRORS]
[/FILE]
[FILE]
	[FILENAME]uqm-0.6.0-voice.uqm[/FILENAME]
	[MD5]d31577b896be935cc2238afd07299b8b[/MD5]
	[PATH]$HOME/.uqm/content/packages[/PATH]
	[MIRRORS]
		[URL]http://download.sourceforge.net/sc2/uqm-0.6.0-voice.uqm[/URL]
		[URL]http://download.sourceforge.net/sc2/uqm-0.6.0-voice.uqm[/URL]
		[URL]http://download.sourceforge.net/sc2/uqm-0.6.0-voice.uqm[/URL]
	[/MIRRORS]
[/FILE]
[FILE]
	[FILENAME]uqm-0.6.0-3domusic.uqm[/FILENAME]
	[MD5]a20cacc8e66f5ff1fdf5e1d3a3b93fd2[/MD5]
	[PATH]$HOME/.uqm/content/packages[/PATH]
	[MIRRORS]
		[URL]http://download.sourceforge.net/sc2/uqm-0.6.0-3domusic.uqm[/URL]
		[URL]http://download.sourceforge.net/sc2/uqm-0.6.0-3domusic.uqm[/URL]
		[URL]http://download.sourceforge.net/sc2/uqm-0.6.0-3domusic.uqm[/URL]
	[/MIRRORS]
[/FILE]
[/FILELIST]

uqm-optflags.patch:

Index: uqm-optflags.patch
===================================================================
RCS file: /cvs/pkgs/rpms/uqm/devel/uqm-optflags.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- uqm-optflags.patch	22 Dec 2006 20:26:17 -0000	1.3
+++ uqm-optflags.patch	11 Sep 2008 04:49:13 -0000	1.4
@@ -1,15 +1,16 @@
---- sc2/build/unix/build.config~	2005-05-19 04:11:25.000000000 +0300
-+++ sc2/build/unix/build.config	2005-05-21 23:30:40.000000000 +0300
-@@ -81,7 +81,7 @@
- 	CHOICE_debug_OPTION_nodebug_TITLE="No debugging information"
+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"
  		DEBUG=0
  	}
- 	CHOICE_debug_OPTION_debug_TITLE="Debugging information"
-@@ -122,7 +122,7 @@
+ 	CHOICE_debug_OPTION_debug_TITLE="Debugging build"
+@@ -131,7 +131,7 @@ uqm_prepare_config()
  				# for more readable messages.
  		DEBUG=1
  	}


Index: uqm.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/uqm/devel/uqm.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- uqm.desktop	11 Dec 2004 15:54:10 -0000	1.2
+++ uqm.desktop	11 Sep 2008 04:49:13 -0000	1.3
@@ -3,7 +3,7 @@
 Comment=An epic space adventure
 Comment[fi]=Eeppinen avaruusseikkailu
 Exec=uqm
-Icon=uqm.png
+Icon=uqm
 Terminal=false
 Type=Application
 Encoding=UTF-8


Index: uqm.sh
===================================================================
RCS file: /cvs/pkgs/rpms/uqm/devel/uqm.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- uqm.sh	24 May 2005 06:42:29 -0000	1.1
+++ uqm.sh	11 Sep 2008 04:49:13 -0000	1.2
@@ -2,6 +2,18 @@
 
 # Wrapper script for starting The Ur-Quan Masters
 
+# base settings
+myShareDir=/usr/share/uqm
+myHomeDir=~/.uqm
+
+. $myShareDir/uqm-functions.sh
+
+echo ""
+echo "starting uqm ..."
+
+# creates a local working directory in user-home
+createLocalDir
+
 # Source system wide settings
 if [ -e /etc/uqm.conf ] ; then
   . /etc/uqm.conf


Index: uqm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/uqm/devel/uqm.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- uqm.spec	17 Feb 2008 18:52:59 -0000	1.15
+++ uqm.spec	11 Sep 2008 04:49:13 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           uqm
 Version:        0.6.2
-Release:        3%{?dist}
+Release:        5%{?dist}
 Summary:        The Ur-Quan Masters, a port of the classic game Star Control II
 
 Group:          Amusements/Games
@@ -10,6 +10,8 @@
 Source1:        %{name}.conf
 Source2:        %{name}.sh
 Source3:        %{name}.desktop
+Source4:        %{name}-functions.sh
+Source5:        %{name}.autodlrc
 Patch0:         %{name}-optflags.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -20,8 +22,8 @@
 BuildRequires:  zlib-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  libGLU-devel
-BuildRequires:  mikmod-devel
-Requires:       %{name}-content >= 0.6
+BuildRequires:  libmikmod-devel
+Requires:       autodownloader
 
 
 %description
@@ -39,7 +41,8 @@
 
 %build
 pushd sc2
-echo INPUT_install_sharedir_VALUE=%{_datadir}/games > config.state
+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
 convert src/res/ur-quan-icon-std.ico uqm.png
 
@@ -59,8 +62,8 @@
 install -Dpm 755 uqm $RPM_BUILD_ROOT%{_prefix}/games/uqm
 
 install -dm 755 \
-  $RPM_BUILD_ROOT%{_datadir}/games/uqm/content/packages/addons/uqmremix
-echo %{version} > $RPM_BUILD_ROOT%{_datadir}/games/uqm/content/version
+  $RPM_BUILD_ROOT%{_datadir}/uqm/content/packages/addons/uqmremix
+echo %{version} > $RPM_BUILD_ROOT%{_datadir}/uqm/content/version
 
 desktop-file-install \
   --vendor fedora \
@@ -70,6 +73,9 @@
  %{SOURCE3}
 install -Dpm 644 uqm-5.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/uqm.png
 
+# needed "data" files
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
+install -p -m 644 %{SOURCE4} %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -82,12 +88,19 @@
 %config(noreplace) %{_sysconfdir}/uqm.conf
 %{_bindir}/uqm
 %{_prefix}/games/uqm
-%{_datadir}/games/uqm/
+%{_datadir}/uqm/
 %{_datadir}/applications/*-%{name}.desktop
 %{_datadir}/pixmaps/uqm.png
 
 
 %changelog
+* Wed Sep 10 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.6.2-5
+- drop /usr/share/games/uqm to /usr/share/uqm
+
+* Wed Sep 10 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.6.2-4
+- convert package to use autodownloader
+- look for content in user homedir
+
 * Sun Feb 17 2008 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.6.2-3
 - Rebuild for newer mikmod.

More information about the fedora-extras-commits mailing list