Commit 942bf7e9 authored by Phil Morrell's avatar Phil Morrell

Import Upstream version 1.2.4.dfsg.1

parent 652d7603
......@@ -76,7 +76,7 @@ The Author: Andy Southgate of 64 Fen Road, Cambridge, CB4 1TX, England.
Please use this address for correspondance.
This Package: The software, package or installer named
Adanaxis GPL version 1.2.2
Adanaxis GPL version 1.2.4
Schedule 2: Proprietary original source files
=============================================
......
......@@ -10,8 +10,8 @@ Unix/POSIX/Linux/FreeBSD
Download and unpack the source and data files and build thus:
tar xvzf adanaxisgpl-1.2.2.tar.gz
cd adanaxisgpl-1.2.2
tar xvzf adanaxisgpl-1.2.4.tar.gz
cd adanaxisgpl-1.2.4
./configure
# (spend a few days getting the libraries that configure asks for)
make
......@@ -22,7 +22,7 @@ Alternatively, the application can be started without installing. In this
case the data path enviroment variable must be set. For example:
make
export adanaxisgpl_DATA_DIR=$HOME/adanaxisgpl-1.2.2/data-adanaxisgpl
export adanaxisgpl_DATA_DIR=$HOME/adanaxisgpl-1.2.4/data-adanaxisgpl
src/adanaxisgpl
Mac OS X
......
......@@ -106,5 +106,5 @@ debian-release-unsigned: $(GZIPFILE)
dpkg-buildpackage -rfakeroot -us -uc
# Blank line required - configuration scripts append here
EXTRA_DIST=autogen.pl prebuild.sh adanaxisgpl.spec macosx/project/Maurheen-Info.plist macosx/project/TestMushPie-Info.plist macosx/project/TestMustl-Info.plist macosx/project/Adanaxis-Info.plist macosx/project/TesseractTrainer.plist macosx/project/Mushcore-Info.plist macosx/project/MushPie-Info.plist macosx/project/TestMushMesh-Info.plist macosx/project/dummp-Info.plist macosx/project/all.Info.plist macosx/project/TestMushcore-Info.plist macosx/project/MushMesh-Info.plist macosx/project/MushRuby-Info.plist macosx/project/Mustl-Info.plist README README.linux README.win32 README.macosx autogen.pl SourceConditioner.pl SourceProcess.pm macosx/project/project.xcodeproj/southa.pbxuser macosx/project/project.xcodeproj/project.pbxproj macosx/MakeRelease.sh macosx/adanaxis_app.icns scripts/AmendToType.rb scripts/FileMush.rb scripts/ImageProcess.rb scripts/MushObject.rb scripts/ProcessAnimation.rb scripts/ProcessCosmos.rb scripts/ProcessIntern.rb scripts/ProcessMush.rb scripts/SourceProcess.rb targets/adanaxis.spec.fedora targets/adanaxis.ChangeLog targets/adanaxis.debian.copyright targets/adanaxis.def targets/adanaxis.spec.mdk targets/adanaxis.debian.watch targets/adanaxis.debian.control targets/adanaxis.spec.generic targets/adanaxis.debian.rules targets/adanaxis.debian.menu targets/adanaxis.debian.changelog targets/app.acinclude.m4 targets/sdl_app.spec targets/app.README targets/sdl_app.spec.mdk targets/sdl_app.configure.in targets/app.Makefile.am targets/app.COPYING targets/app.AUTHORS targets/app.INSTALL targets/app.prebuild.sh targets/commercial.COPYING targets/empty.MushSecretKeys.cpp targets/empty.prebuild.sh targets/sdl_app.spec targets/sdl_app.spec.mdk targets/sdl_app.configure.in targets/win32.installer.nsi win32/adanaxisrenderingdemo_inst_app.ico win32/adanaxiscontroldemo_inst_app.ico win32/adanaxiscontroldemo_app.ico win32/adanaxiscontroldemo_uninst_app.ico win32/adanaxisrenderingdemo_uninst_app.ico win32/adanaxisrenderingdemo_app.ico win32/MakeInstaller.sh win32/installer.nsi win32/FileListToNSI.rb VisualC/project/adanaxis_app.ico VisualC/project/adanaxis.rc VisualC/project/adanaxis.vcproj VisualC/project/adanaxiscontroldemo_app.ico x11/icons/adanaxisgpl-32.png x11/icons/adanaxisgpl-16.png x11/icons/adanaxisgpl-48.png x11/icons/adanaxisgpl48x48.xpm x11/icons/adanaxisgpl16x16.xpm x11/icons/adanaxisgpl32x32.xpm
EXTRA_DIST=autogen.pl prebuild.sh adanaxisgpl.spec macosx/project/TesseractTrainer.plist macosx/project/Adanaxis-Info.plist macosx/project/all.Info.plist macosx/project/MushRuby-Info.plist macosx/project/TestMustl-Info.plist macosx/project/MushPie-Info.plist macosx/project/TestMushMesh-Info.plist macosx/project/TestMushPie-Info.plist macosx/project/dummp-Info.plist macosx/project/Mushcore-Info.plist macosx/project/TestMushcore-Info.plist macosx/project/Mustl-Info.plist macosx/project/Maurheen-Info.plist macosx/project/MushMesh-Info.plist README.win32 README.linux README README.macosx SourceConditioner.pl autogen.pl SourceProcess.pm macosx/project/project.xcodeproj/project.pbxproj macosx/project/project.xcodeproj/southa.pbxuser macosx/MakeRelease.sh macosx/adanaxis_app.icns scripts/AmendToType.rb scripts/FileMush.rb scripts/ImageProcess.rb scripts/MushObject.rb scripts/ProcessAnimation.rb scripts/ProcessCosmos.rb scripts/ProcessIntern.rb scripts/ProcessMush.rb scripts/SourceProcess.rb targets/adanaxis.spec.generic targets/adanaxis.debian.watch targets/adanaxis.debian.menu targets/adanaxis.spec.mdk targets/adanaxis.spec.fedora targets/adanaxis.ChangeLog targets/adanaxis.debian.changelog targets/adanaxis.debian.copyright targets/adanaxis.def targets/adanaxis.debian.control targets/adanaxis.debian.rules targets/app.prebuild.sh targets/app.COPYING targets/sdl_app.spec.mdk targets/sdl_app.configure.in targets/app.INSTALL targets/app.AUTHORS targets/app.README targets/app.Makefile.am targets/app.acinclude.m4 targets/sdl_app.spec targets/commercial.COPYING targets/empty.prebuild.sh targets/empty.MushSecretKeys.cpp targets/sdl_app.spec.mdk targets/sdl_app.configure.in targets/sdl_app.spec targets/win32.installer.nsi win32/adanaxiscontroldemo_uninst_app.ico win32/adanaxisrenderingdemo_app.ico win32/adanaxiscontroldemo_app.ico win32/adanaxisrenderingdemo_uninst_app.ico win32/adanaxiscontroldemo_inst_app.ico win32/adanaxisrenderingdemo_inst_app.ico win32/MakeInstaller.sh win32/installer.nsi win32/FileListToNSI.rb VisualC/project/adanaxis.vcproj VisualC/project/adanaxis.rc VisualC/project/adanaxis_app.ico VisualC/project/adanaxiscontroldemo_app.ico x11/icons/adanaxisgpl-32.png x11/icons/adanaxisgpl-16.png x11/icons/adanaxisgpl-48.png x11/icons/adanaxisgpl32x32.xpm x11/icons/adanaxisgpl48x48.xpm x11/icons/adanaxisgpl16x16.xpm
dist_man_MANS=x11/man/adanaxisgpl.6
......@@ -266,55 +266,56 @@ MUSHDATADIR = data-adanaxisgpl
# Blank line required - configuration scripts append here
EXTRA_DIST = autogen.pl prebuild.sh adanaxisgpl.spec \
macosx/project/Maurheen-Info.plist \
macosx/project/TestMushPie-Info.plist \
macosx/project/TestMustl-Info.plist \
macosx/project/Adanaxis-Info.plist \
macosx/project/TesseractTrainer.plist \
macosx/project/Mushcore-Info.plist \
macosx/project/Adanaxis-Info.plist \
macosx/project/all.Info.plist \
macosx/project/MushRuby-Info.plist \
macosx/project/TestMustl-Info.plist \
macosx/project/MushPie-Info.plist \
macosx/project/TestMushMesh-Info.plist \
macosx/project/dummp-Info.plist macosx/project/all.Info.plist \
macosx/project/TestMushPie-Info.plist \
macosx/project/dummp-Info.plist \
macosx/project/Mushcore-Info.plist \
macosx/project/TestMushcore-Info.plist \
macosx/project/MushMesh-Info.plist \
macosx/project/MushRuby-Info.plist \
macosx/project/Mustl-Info.plist README README.linux \
README.win32 README.macosx autogen.pl SourceConditioner.pl \
macosx/project/Mustl-Info.plist \
macosx/project/Maurheen-Info.plist \
macosx/project/MushMesh-Info.plist README.win32 README.linux \
README README.macosx SourceConditioner.pl autogen.pl \
SourceProcess.pm \
macosx/project/project.xcodeproj/southa.pbxuser \
macosx/project/project.xcodeproj/project.pbxproj \
macosx/project/project.xcodeproj/southa.pbxuser \
macosx/MakeRelease.sh macosx/adanaxis_app.icns \
scripts/AmendToType.rb scripts/FileMush.rb \
scripts/ImageProcess.rb scripts/MushObject.rb \
scripts/ProcessAnimation.rb scripts/ProcessCosmos.rb \
scripts/ProcessIntern.rb scripts/ProcessMush.rb \
scripts/SourceProcess.rb targets/adanaxis.spec.fedora \
targets/adanaxis.ChangeLog targets/adanaxis.debian.copyright \
targets/adanaxis.def targets/adanaxis.spec.mdk \
targets/adanaxis.debian.watch targets/adanaxis.debian.control \
targets/adanaxis.spec.generic targets/adanaxis.debian.rules \
targets/adanaxis.debian.menu targets/adanaxis.debian.changelog \
targets/app.acinclude.m4 targets/sdl_app.spec \
targets/app.README targets/sdl_app.spec.mdk \
targets/sdl_app.configure.in targets/app.Makefile.am \
targets/app.COPYING targets/app.AUTHORS targets/app.INSTALL \
targets/app.prebuild.sh targets/commercial.COPYING \
targets/empty.MushSecretKeys.cpp targets/empty.prebuild.sh \
targets/sdl_app.spec targets/sdl_app.spec.mdk \
targets/sdl_app.configure.in targets/win32.installer.nsi \
win32/adanaxisrenderingdemo_inst_app.ico \
win32/adanaxiscontroldemo_inst_app.ico \
win32/adanaxiscontroldemo_app.ico \
scripts/SourceProcess.rb targets/adanaxis.spec.generic \
targets/adanaxis.debian.watch targets/adanaxis.debian.menu \
targets/adanaxis.spec.mdk targets/adanaxis.spec.fedora \
targets/adanaxis.ChangeLog targets/adanaxis.debian.changelog \
targets/adanaxis.debian.copyright targets/adanaxis.def \
targets/adanaxis.debian.control targets/adanaxis.debian.rules \
targets/app.prebuild.sh targets/app.COPYING \
targets/sdl_app.spec.mdk targets/sdl_app.configure.in \
targets/app.INSTALL targets/app.AUTHORS targets/app.README \
targets/app.Makefile.am targets/app.acinclude.m4 \
targets/sdl_app.spec targets/commercial.COPYING \
targets/empty.prebuild.sh targets/empty.MushSecretKeys.cpp \
targets/sdl_app.spec.mdk targets/sdl_app.configure.in \
targets/sdl_app.spec targets/win32.installer.nsi \
win32/adanaxiscontroldemo_uninst_app.ico \
win32/adanaxisrenderingdemo_app.ico \
win32/adanaxiscontroldemo_app.ico \
win32/adanaxisrenderingdemo_uninst_app.ico \
win32/adanaxisrenderingdemo_app.ico win32/MakeInstaller.sh \
win32/installer.nsi win32/FileListToNSI.rb \
VisualC/project/adanaxis_app.ico VisualC/project/adanaxis.rc \
VisualC/project/adanaxis.vcproj \
win32/adanaxiscontroldemo_inst_app.ico \
win32/adanaxisrenderingdemo_inst_app.ico \
win32/MakeInstaller.sh win32/installer.nsi \
win32/FileListToNSI.rb VisualC/project/adanaxis.vcproj \
VisualC/project/adanaxis.rc VisualC/project/adanaxis_app.ico \
VisualC/project/adanaxiscontroldemo_app.ico \
x11/icons/adanaxisgpl-32.png x11/icons/adanaxisgpl-16.png \
x11/icons/adanaxisgpl-48.png x11/icons/adanaxisgpl48x48.xpm \
x11/icons/adanaxisgpl16x16.xpm x11/icons/adanaxisgpl32x32.xpm
x11/icons/adanaxisgpl-48.png x11/icons/adanaxisgpl32x32.xpm \
x11/icons/adanaxisgpl48x48.xpm x11/icons/adanaxisgpl16x16.xpm
dist_man_MANS = x11/man/adanaxisgpl.6
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
......
# Spec file for Mandriva Linux
# $Id: adanaxis.spec.generic,v 1.2 2007/09/27 11:52:44 southa Exp $
# $Log: adanaxis.spec.generic,v $
# Revision 1.2 2007/09/27 11:52:44 southa
# $Id: adanaxis.spec.fedora,v 1.4 2007/10/18 00:04:13 southa Exp $
# $Log: adanaxis.spec.fedora,v $
# Revision 1.4 2007/10/18 00:04:13 southa
# Fedora packaging review comments
#
# Revision 1.3 2007/10/17 23:44:50 southa
# Fedora packaging review comments
#
# Revision 1.2 2007/09/27 12:10:09 southa
# Fixed changelog
#
# Revision 1.1 2007/09/27 11:52:44 southa
# Fedora release
#
# Revision 1.1 2007/06/30 16:02:14 southa
......@@ -17,36 +26,29 @@
# Mandriva packaging
#
# This is a 'generic' RPM spec, designed to produce binary RPMs usable on most systems.
# For a more specific one, try:
# perl autogen.pl --type=gpl --dist=mandriva adanaxis
%define name adanaxisgpl
%define version 1.2.2
%define release 1generic
%define section More Applications/Games/Arcade
%define title Adanaxis GPL
%define title Adanaxis GPL
%define longtitle Adanaxis GPL - an action game in four spatial dimensions
%define Summary Action game in four spatial dimensions
Summary: %Summary
Name: %name
Version: %version
Release: %release
License: Shareware
Group: Games/Arcade
Summary: Action game in four spatial dimensions
Name: adanaxisgpl
Version: 1.2.4
Release: 1%{?dist}
License: GPLv2
Group: Amusements/Games
URL: http://www.mushware.com/
Source0: http://www.mushware.com/files/%name-%version.tar.gz
Source0: http://www.mushware.com/files/%{name}-1.2.4.tar.gz
BuildRoot: %_tmppath/%name-buildroot
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
# Buildrequires not used for generic RPM - package naming not consistent between distros
# Buildrequires: autoconf2.5 automake binutils libmesaglut3-devel gcc gcc-c++ glibc-devel
# Buildrequires: libexpat0-devel libjpeg62-devel libmesagl1-devel libmesaglu1-devel libpcre0-devel
# Buildrequires: libSDL1.2-devel libSDL_mixer1.2-devel libtiff3-devel make
BuildRequires: desktop-file-utils
BuildRequires: freeglut-devel
BuildRequires: expat-devel
BuildRequires: libjpeg-devel
BuildRequires: libtiff-devel
BuildRequires: libvorbis-devel
BuildRequires: pcre-devel
BuildRequires: SDL_mixer-devel
%description
Adanaxis is a fast-moving first person shooter set in deep space, where the
......@@ -66,43 +68,16 @@ Shading Language.
%setup -q
%build
# Use autopackage's apbuild for wider compatibility
export CC=apgcc
export CXX=apg++
# libtiff has had ABI stability issues so link statically
export APBUILD_STATIC=tiff
./configure
make
%configure
make %{?_smp_mflags}
%install
rm -rf %buildroot
%makeinstall
# Old-style menu
mkdir -p %buildroot/%_menudir
cat > %buildroot/%_menudir/%name << EOF
?package(%name): \
command="%_bindir/%name" \
needs="X11" \
icon="%name.png" \
section="%section" \
title="%title" \
longtitle="%longtitle"
?package(%name): \
command="%_bindir/%name --recover" \
needs="X11" \
icon="%name.png" \
section="%section" \
title="%title (Recovery Mode)" \
longtitle="%longtitle (Launch in Recovery Mode)"
EOF
rm -rf %{buildroot}
make DESTDIR=%{buildroot} INSTALL="install -p" CPPROG="cp -p" install
# New-style menu
# Build .desktop files
mkdir -p %{buildroot}%{_datadir}/applications
cat > %{buildroot}%{_datadir}/applications/mushware-%{name}.desktop <<EOF
cat > %{name}.desktop <<EOF
[Desktop Entry]
Encoding=UTF-8
Name=%{title}
......@@ -112,11 +87,10 @@ Icon=%{name}
Terminal=false
Type=Application
StartupNotify=false
Categories=GNOME;GTK;KDE;MoreApplications;Games;Arcade;X-MandrivaLinux-MoreApplications-Games-Arcade;
Categories=Game;ActionGame;
EOF
mkdir -p %{buildroot}%{_datadir}/applications
cat > %{buildroot}%{_datadir}/applications/mushware-%{name}-recover.desktop <<EOF
cat > %{name}-recover.desktop <<EOF
[Desktop Entry]
Encoding=UTF-8
Name=%{title} (Recovery Mode)
......@@ -126,34 +100,61 @@ Icon=%{name}
Terminal=false
Type=Application
StartupNotify=false
Categories=GNOME;GTK;KDE;MoreApplications;Games;Arcade;X-MandrivaLinux-MoreApplications-Games-Arcade;
Categories=Game;ActionGame;
EOF
%__install -D -m 644 x11/icons/%{name}-48.png %buildroot/%_liconsdir/%name.png
%__install -D -m 644 x11/icons/%{name}-32.png %buildroot/%_iconsdir/%name.png
%__install -D -m 644 x11/icons/%{name}-16.png %buildroot/%_miconsdir/%name.png
# Install desktop files
mkdir -p %{buildroot}%{_datadir}/applications
desktop-file-install --vendor=mushware \
--dir %{buildroot}%{_datadir}/applications \
%{name}.desktop
desktop-file-install --vendor=mushware \
--dir %{buildroot}%{_datadir}/applications \
%{name}-recover.desktop
# Icons
mkdir -p -m 755 %{buildroot}%{_datadir}/icons/hicolor/16x16/apps
mkdir -p -m 755 %{buildroot}%{_datadir}/icons/hicolor/32x32/apps
mkdir -p -m 755 %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
install -p -m 644 x11/icons/%{name}-16.png %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
install -p -m 644 x11/icons/%{name}-32.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
install -p -m 644 x11/icons/%{name}-48.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
%post
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
%postun
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
%clean
rm -rf %buildroot
rm -rf %{buildroot}
%files
%defattr(0755,root,root,0755)
%_bindir/*
%defattr(0644,root,root,0755)
%doc COPYING README INSTALL ChangeLog AUTHORS
%_datadir/adanaxisgpl/*
%_datadir/applications/mushware-%{name}.desktop
%_datadir/applications/mushware-%{name}-recover.desktop
%_menudir/*
%_miconsdir/%name.png
%_iconsdir/%name.png
%_liconsdir/%name.png
%dir %{_datadir}/%{name}
%{_datadir}/applications/*
%{_datadir}/%{name}/*
%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
%_mandir/man6/%{name}*.6*
%changelog
* Fri Jun 29 2007 Andy Southgate <andy.southgate@mushware.com> 1.1.0-1mushmdk
- Created from skel.spec
* Thu Oct 25 2007 Andy Southgate <andy.southgate@mushware.com> 1.2.4-1
- Updates following further review (bugzilla #309061)
* Wed Oct 17 2007 Andy Southgate <andy.southgate@mushware.com> 1.2.3-1
- Updates following review (bugzilla #309061)
* Thu Sep 27 2007 Andy Southgate <andy.southgate@mushware.com> 1.2.1-1
- Created from Mandriva .spec
......@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
timestamp='2006-07-02'
timestamp='2007-07-22'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
......@@ -161,6 +161,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
arm*) machine=arm-unknown ;;
sh3el) machine=shl-unknown ;;
sh3eb) machine=sh-unknown ;;
sh5el) machine=sh5le-unknown ;;
*) machine=${UNAME_MACHINE_ARCH}-unknown ;;
esac
# The Operating System including object format, if it has switched
......@@ -329,7 +330,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
i86pc:SunOS:5.*:*)
i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
sun4*:SunOS:6*:*)
......@@ -780,7 +781,7 @@ EOF
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
exit ;;
i*:MINGW*:*)
*:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
i*:windows32*:*)
......@@ -790,12 +791,15 @@ EOF
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
exit ;;
x86:Interix*:[3456]*)
echo i586-pc-interix${UNAME_RELEASE}
exit ;;
EM64T:Interix*:[3456]*)
echo x86_64-unknown-interix${UNAME_RELEASE}
exit ;;
*:Interix*:[3456]*)
case ${UNAME_MACHINE} in
x86)
echo i586-pc-interix${UNAME_RELEASE}
exit ;;
EM64T | authenticamd)
echo x86_64-unknown-interix${UNAME_RELEASE}
exit ;;
esac ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
exit ;;
......@@ -950,6 +954,9 @@ EOF
x86_64:Linux:*:*)
echo x86_64-unknown-linux-gnu
exit ;;
xtensa:Linux:*:*)
echo xtensa-unknown-linux-gnu
exit ;;
i*86:Linux:*:*)
# The BFD linker knows what the default object file format is, so
# first see if it will tell us. cd to the root directory to prevent
......@@ -1208,6 +1215,15 @@ EOF
SX-6:SUPER-UX:*:*)
echo sx6-nec-superux${UNAME_RELEASE}
exit ;;
SX-7:SUPER-UX:*:*)
echo sx7-nec-superux${UNAME_RELEASE}
exit ;;
SX-8:SUPER-UX:*:*)
echo sx8-nec-superux${UNAME_RELEASE}
exit ;;
SX-8R:SUPER-UX:*:*)
echo sx8r-nec-superux${UNAME_RELEASE}
exit ;;
Power*:Rhapsody:*:*)
echo powerpc-apple-rhapsody${UNAME_RELEASE}
exit ;;
......
......@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
timestamp='2006-07-02'
timestamp='2007-06-28'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
......@@ -245,12 +245,12 @@ case $basic_machine in
| bfin \
| c4x | clipper \
| d10v | d30v | dlx | dsp16xx \
| fr30 | frv \
| fido | fr30 | frv \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
| m32c | m32r | m32rle | m68000 | m68k | m88k \
| maxq | mb | microblaze | mcore \
| maxq | mb | microblaze | mcore | mep \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
......@@ -276,6 +276,7 @@ case $basic_machine in
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
| score \
| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
......@@ -284,7 +285,7 @@ case $basic_machine in
| tahoe | thumb | tic4x | tic80 | tron \
| v850 | v850e \
| we32k \
| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
| z8k)
basic_machine=$basic_machine-unknown
;;
......@@ -323,7 +324,7 @@ case $basic_machine in
| clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| elxsi-* \
| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| i*86-* | i860-* | i960-* | ia64-* \
......@@ -367,7 +368,7 @@ case $basic_machine in
| tron-* \
| v850-* | v850e-* | vax-* \
| we32k-* \
| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
| xstormy16-* | xtensa-* \
| ymp-* \
| z8k-*)
......@@ -474,8 +475,8 @@ case $basic_machine in
basic_machine=craynv-cray
os=-unicosmp
;;
cr16c)
basic_machine=cr16c-unknown
cr16)
basic_machine=cr16-unknown
os=-elf
;;
crds | unos)
......@@ -682,6 +683,10 @@ case $basic_machine in
basic_machine=i386-pc
os=-mingw32
;;
mingw32ce)
basic_machine=arm-unknown
os=-mingw32ce
;;
miniframe)
basic_machine=m68000-convergent
;;
......@@ -909,6 +914,10 @@ case $basic_machine in
sb1el)
basic_machine=mipsisa64sb1el-unknown
;;
sde)
basic_machine=mipsisa32-sde
os=-elf
;;
sei)
basic_machine=mips-sei
os=-seiux
......@@ -920,6 +929,9 @@ case $basic_machine in
basic_machine=sh-hitachi
os=-hms
;;
sh5el)
basic_machine=sh5le-unknown
;;
sh64)
basic_machine=sh64-unknown
;;
......@@ -1214,7 +1226,7 @@ case $os in
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
| -skyos* | -haiku* | -rdos* | -toppers*)
| -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
......@@ -1366,6 +1378,9 @@ else
# system, and we'll never get to this point.
case $basic_machine in
score-*)
os=-elf
;;
spu-*)
os=-elf
;;
......@@ -1406,6 +1421,9 @@ case $basic_machine in
m68*-cisco)
os=-aout
;;
mep-*)
os=-elf
;;
mips*-cisco)
os=-elf
;;
......
......@@ -1935,7 +1935,7 @@ test -n "$target_alias" &&
APP_MAJOR_VERSION=1
APP_MINOR_VERSION=2
APP_MICRO_VERSION=2
APP_MICRO_VERSION=4
APP_VERSION=$APP_MAJOR_VERSION.$APP_MINOR_VERSION.$APP_MICRO_VERSION
APP_UNDERSCORE_VERSION=${APP_MAJOR_VERSION}_${APP_MINOR_VERSION}_${APP_MICRO_VERSION}
......
......@@ -6,7 +6,7 @@ AC_CANONICAL_TARGET
APP_MAJOR_VERSION=1
APP_MINOR_VERSION=2
APP_MICRO_VERSION=2
APP_MICRO_VERSION=4
APP_VERSION=$APP_MAJOR_VERSION.$APP_MINOR_VERSION.$APP_MICRO_VERSION
APP_UNDERSCORE_VERSION=${APP_MAJOR_VERSION}_${APP_MINOR_VERSION}_${APP_MICRO_VERSION}
......
File mode changed from 100644 to 100755
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
##############################################################################
#
# File targets/adaanxis.def
# File targets/adanaxis.def
#
# Author Andy Southgate 2007
#
......@@ -16,8 +16,11 @@
# This software carries NO WARRANTY of any kind.
#
##############################################################################
# $Id: adanaxis.def,v 1.40 2007/10/12 20:38:38 southa Exp $
# $Id: adanaxis.def,v 1.41 2007/10/17 23:44:49 southa Exp $
# $Log: adanaxis.def,v $
# Revision 1.41 2007/10/17 23:44:49 southa
# Fedora packaging review comments
#
# Revision 1.40 2007/10/12 20:38:38 southa
# Debian package fixes
#
......@@ -161,7 +164,7 @@ IfNotType: gpl Subst: MUSH_APP_LICENCE 'Shareware'
Subst: MUSH_APP_MAJOR_VERSION '1'
Subst: MUSH_APP_MINOR_VERSION '2'
Subst: MUSH_APP_MICRO_VERSION '2'
Subst: MUSH_APP_MICRO_VERSION '4'
Subst: MUSH_APP_VERSION 'MUSH_APP_MAJOR_VERSION.MUSH_APP_MINOR_VERSION.MUSH_APP_MICRO_VERSION'
Subst: MUSH_DATA_DIR 'data-adanaxis'
Subst: MUSH_DATA_MAKEFILE 'data-adanaxis/Makefile'
......
# Spec file for Mandriva Linux
# $Id: adanaxis.spec.fedora,v 1.2 2007/09/27 12:10:09 southa Exp $
# $Id: adanaxis.spec.fedora,v 1.4 2007/10/18 00:04:13 southa Exp $
# $Log: adanaxis.spec.fedora,v $
# Revision 1.4 2007/10/18 00:04:13 southa
# Fedora packaging review comments
#
# Revision 1.3 2007/10/17 23:44:50 southa
# Fedora packaging review comments
#
# Revision 1.2 2007/09/27 12:10:09 southa
# Fixed changelog
#
......@@ -20,34 +26,29 @@
# Mandriva packaging
#
%define _menudir %{_datadir}/applications
%define _iconsdir %{_datadir}/pixmaps
%define name MUSH_APP_PACKAGE
%define version MUSH_APP_VERSION
%define release MUSH_APP_RELEASE
%define section More Applications/Games/Arcade
%define title MUSH_APP_NAME
%define title MUSH_APP_NAME
%define longtitle MUSH_APP_NAME - an action game in four spatial dimensions
%define Summary Action game in four spatial dimensions
Summary: %Summary
Name: %name
Version: %version
Release: %release
Summary: Action game in four spatial dimensions
Name: MUSH_APP_PACKAGE
Version: MUSH_APP_VERSION
Release: MUSH_APP_RELEASE%{?dist}
License: MUSH_APP_LICENCE
Group: Amusements/Games
URL: http://www.mushware.com/
Source0: http://www.mushware.com/files/%name-%version.tar.gz
Source0: http://www.mushware.com/files/%{name}-MUSH_APP_VERSION.tar.gz
BuildRoot: %_tmppath/%name-buildroot
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Buildrequires: autoconf automake binutils freeglut-devel gcc gcc-c++ glibc-devel
Buildrequires: expat-devel libjpeg-devel libGL-devel libGLU-devel pcre-devel
Buildrequires: SDL-devel SDL_mixer-devel libtiff-devel make
BuildRequires: desktop-file-utils
BuildRequires: freeglut-devel
BuildRequires: expat-devel
BuildRequires: libjpeg-devel
BuildRequires: libtiff-devel
BuildRequires: libvorbis-devel
BuildRequires: pcre-devel
BuildRequires: SDL_mixer-devel
%description
Adanaxis is a fast-moving first person shooter set in deep space, where the
......@@ -68,16 +69,15 @@ Shading Language.
%build
%configure
make
make %{?_smp_mflags}
%install
rm -rf %buildroot
%makeinstall
rm -rf %{buildroot}
make DESTDIR=%{buildroot} INSTALL="install -p" CPPROG="cp -p" install
# New-style menu
# Build .desktop files
mkdir -p %{buildroot}%{_menudir}
cat > %{buildroot}%{_menudir}/mushware-%{name}.desktop <<EOF
cat > %{name}.desktop <<EOF
[Desktop Entry]
Encoding=UTF-8
Name=%{title}
......@@ -87,10 +87,10 @@ Icon=%{name}
Terminal=false
Type=Application
StartupNotify=false
Categories=Game;ActionGame;MoreApplications;X-MandrivaLinux-MoreApplications-Games-Arcade;
Categories=Game;ActionGame;
EOF
cat > %{buildroot}%{_menudir}/mushware-%{name}-recover.desktop <<EOF
cat > %{name}-recover.desktop <<EOF
[Desktop Entry]
Encoding=UTF-8
Name=%{title} (Recovery Mode)
......@@ -100,31 +100,61 @@ Icon=%{name}
Terminal=false
Type=Application
StartupNotify=false
Categories=Game;ActionGame;MoreApplications;X-MandrivaLinux-MoreApplications-Games-Arcade;
Categories=Game;ActionGame;
EOF
# Icons
# Install desktop files
mkdir -p %{buildroot}%{_datadir}/applications
desktop-file-install --vendor=mushware \
--dir %{buildroot}%{_datadir}/applications \
%{name}.desktop
desktop-file-install --vendor=mushware \
--dir %{buildroot}%{_datadir}/applications \
%{name}-recover.desktop
mkdir -p %{buildroot}%{_iconsdir}
install -d %{buildroot}%{_iconsdir}
install -m 644 x11/icons/%{name}-16.png %{buildroot}%{_iconsdir}/%{name}-16.png
install -m 644 x11/icons/%{name}-32.png %{buildroot}%{_iconsdir}/%{name}-32.png
install -m 644 x11/icons/%{name}-48.png %{buildroot}%{_iconsdir}/%{name}-48.png
install -m 644 x11/icons/%{name}-32.png %{buildroot}%{_iconsdir}/%{name}.png
# Icons
mkdir -p -m 755 %{buildroot}%{_datadir}/icons/hicolor/16x16/apps
mkdir -p -m 755 %{buildroot}%{_datadir}/icons/hicolor/32x32/apps
mkdir -p -m 755 %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
install -p -m 644 x11/icons/%{name}-16.png %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
install -p -m 644 x11/icons/%{name}-32.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
install -p -m 644 x11/icons/%{name}-48.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
%post
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
%postun
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
%clean
rm -rf %buildroot
rm -rf %{buildroot}
%files
%defattr(0755,root,root,0755)
%_bindir/*
%defattr(0644,root,root,0755)
%doc COPYING README INSTALL ChangeLog AUTHORS
%_datadir/MUSH_APP_PACKAGE/*
%_menudir/*
%_iconsdir/*.png
%dir %{_datadir}/%{name}
%{_datadir}/applications/*
%{_datadir}/%{name}/*
%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
%_mandir/man6/%{name}*.6*
%changelog
* Thu Oct 25 2007 Andy Southgate <andy.southgate@mushware.com> 1.2.4-1
- Updates following further review (bugzilla #309061)
* Wed Oct 17 2007 Andy Southgate <andy.southgate@mushware.com> 1.2.3-1
- Updates following review (bugzilla #309061)
* Thu Sep 27 2007 Andy Southgate <andy.southgate@mushware.com> 1.2.1-1
- Created from Mandriva .spec
......@@ -72,9 +72,9 @@ FunctionEnd
VIAddVersionKey "ProductName" "@NSI_APP_NAME@"
VIAddVersionKey "CompanyName" "Mushware Limited"
VIAddVersionKey "LegalCopyright" "Mushware Limited and Andy Southgate"
VIAddVersionKey "FileVersion" "1.2.2"
VIAddVersionKey "FileVersion" "1.2.4"
VIAddVersionKey "FileDescription" "Mushware software installer. See http://www.mushware.com/."