More fixes for 'make install'. The stella.xpm icon is now installed,

although it isn't strictly needed for Stella itself (it's already
compiled in).

Added stella.spec file, which is used to generate a source RPM for
both PLF (Mandriva) and hopefully for all RPM distros as well.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@809 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba

stella/Makefile

@@ -13,7 +13,7 @@
 ## See the file "license" for information on usage and redistribution of
 ## this file, and for a DISCLAIMER OF ALL WARRANTIES.
 ##
-## $Id: Makefile,v 1.9 2005-09-30 22:12:18 stephena Exp $
+## $Id: Makefile,v 1.10 2005-10-03 00:53:20 stephena Exp $
 ##
 ##   Based on code from ScummVM - Scumm Interpreter
 ##   Copyright (C) 2002-2004 The ScummVM project
@@ -164,6 +164,8 @@ install: all
 	$(INSTALL) -c -m 644 "$(srcdir)/Announce.txt" "$(srcdir)/Changes.txt" "$(srcdir)/Copyright.txt" "$(srcdir)/License.txt" "$(srcdir)/README-PSP.txt" "$(srcdir)/README-SDL.txt" "$(srcdir)/Readme.txt" "$(srcdir)/Todo.txt" "$(srcdir)/docs/stella.html" "$(srcdir)/docs/debugger.html" "$(DESTDIR)$(DOCDIR)/"
 	$(INSTALL) -d "$(DESTDIR)$(DOCDIR)/graphics"
 	$(INSTALL) -c -m 644 "$(srcdir)/docs/graphics/chucky_cheese.png" "$(srcdir)/docs/graphics/circuit.png" "$(srcdir)/docs/graphics/console.png" "$(srcdir)/docs/graphics/eventmapping.png" "$(srcdir)/docs/graphics/eventmapping_remap.png" "$(srcdir)/docs/graphics/jr_pacman.png" "$(srcdir)/docs/graphics/launcher_options_rom.png" "$(srcdir)/docs/graphics/launcher_options_snap.png" "$(srcdir)/docs/graphics/launcher.png" "$(srcdir)/docs/graphics/options_about.png" "$(srcdir)/docs/graphics/options_audio.png" "$(srcdir)/docs/graphics/options_gameinfo.png" "$(srcdir)/docs/graphics/options_help.png" "$(srcdir)/docs/graphics/options_video.png" "$(srcdir)/docs/graphics/pacman.png" "$(srcdir)/docs/graphics/rom_browser.png" "$(srcdir)/docs/graphics/secret_quest.png" "$(srcdir)/docs/graphics/space_invaders.png" "$(DESTDIR)$(DOCDIR)/graphics"
+	$(INSTALL) -d "$(DESTDIR)$(DATADIR)/icons"
+	$(INSTALL) -c -m 644 "$(srcdir)/src/common/stella.xpm" "$(DESTDIR)$(DATADIR)/icons"
 	$(INSTALL) -d "$(DESTDIR)/etc"
 	$(INSTALL) -c -m 644 "$(srcdir)/src/emucore/stella.pro" "$(DESTDIR)/etc"
 
@@ -171,9 +173,10 @@ install-strip: install
 	strip stella$(EXEEXT)
 
 uninstall:
-	rm -f "$(DESTDIR)$(BINDIR)/stella$(EXEEXT)"
+	rm -f  "$(DESTDIR)$(BINDIR)/stella$(EXEEXT)"
 	rm -rf "$(DESTDIR)$(DOCDIR)/"
-	rm -f "$(DESTDIR)/etc/stella.pro"
+	rm -f  "$(DESTDIR)$(DATADIR)/icons/stella.xpm"
+	rm -f  "$(DESTDIR)/etc/stella.pro"
 
 # Special target to create a snapshot binary
 dist: stella$(EXEEXT)

stella/configure

@@ -242,9 +242,10 @@ Configuration:
   -h, --help             display this help and exit
 
 Installation directories:
-  --prefix=DIR           use this prefix for installing stella [/usr/local]
+  --prefix=DIR           use this prefix for installing stella  [/usr/local]
   --bindir=DIR           directory to install the stella binary [PREFIX/bin]
-  --docdir=DIR           directory to install documentation [PREFIX/share/doc/stella]
+  --docdir=DIR           directory to install documentation     [PREFIX/share/doc/stella]
+  --datadir=DIR          directory to install icons/data files  [PREFIX/share]
 
 Optional Features:
   --disable-gl           disable OpenGL rendering support
@@ -324,6 +325,9 @@ for ac_option in $@; do
       --docdir=*)
         _docdir=`echo $ac_option | cut -d '=' -f 2`
         ;;
+      --datadir=*)
+        _datadir=`echo $ac_option | cut -d '=' -f 2`
+        ;;
       *)
         echo "warning: unrecognised option: $ac_option"
         ;;
@@ -601,6 +605,7 @@ echo "$_opengl"
 #
 test -z "$_bindir" && _bindir="$_prefix/bin"
 test -z "$_docdir" && _docdir="$_prefix/share/doc/stella"
+test -z "$_datadir" && _datadir="$_prefix/share"
 
 echo
 echo_n "Summary:"
@@ -803,6 +808,7 @@ NASMFLAGS := $NASMFLAGS
 PREFIX := $_prefix
 BINDIR := $_bindir
 DOCDIR := $_docdir
+DATADIR := $_datadir
 
 $_make_def_HAVE_GCC3
 #$_make_def_HAVE_NASM

stella/src/unix/stella.spec

@@ -0,0 +1,134 @@
+%define name    stella
+%define version 2.0
+%define rel 1
+
+%define build_plf 0
+
+%define enable_gl 1
+%define enable_sound 1
+%define enable_developer 1
+%define enable_snapshot 1
+%define enable_joystick 1
+%define enable_static 0
+
+%if %build_plf
+%define release %{rel}plf
+%else
+%define release %{rel}
+%endif
+
+Summary:        An Atari 2600 Video Computer System emulator
+Name:           %{name}
+Version:        %{version}
+Release:        %{release}
+Group:          Emulators
+License:        GPL
+URL:            http://stella.sourceforge.net
+Source:         %{name}-%{version}.tar.bz2
+BuildRoot:      %_tmppath/%name-%version-%release-root
+BuildRequires:  SDL-devel
+BuildRequires:  XFree86-devel
+BuildRequires:  zlib-devel
+%if %enable_snapshot
+BuildRequires:  libpng-devel
+%endif
+
+%description
+The Atari 2600 Video Computer System (VCS), introduced in 1977, was the most
+popular home video game system of the early 1980's.  This emulator will run
+most Atari ROM images, so that you can play your favorite old Atari 2600 games
+on your PC.
+%if %build_plf
+This package is in PLF as Mandriva Linux policy forbids emulators in contribs.
+%endif
+
+%prep
+
+%setup -q
+
+%build
+export CXXFLAGS=$RPM_OPT_FLAGS
+./configure \
+%if !%enable_gl
+	--disable-gl \
+%endif
+%if !%enable_sound
+	--disable-sound \
+%endif
+%if !%enable_developer
+	--disable-developer \
+%endif
+%if !%enable_snapshot
+	--disable-snapshot \
+%endif
+%if !%enable_joystick
+	--disable-joystick \
+%endif
+%if %enable_static
+	--enable-static \
+%endif
+	--prefix=%{_prefix} \
+	--bindir=%{_bindir} \
+	--docdir=%{_docdir}/stella-%{version} \
+	--datadir=%{_datadir}
+%make
+
+%install
+make install-strip DESTDIR=%{buildroot}
+
+# Mandriva menu entries
+install -d -m0755 %{buildroot}%{_menudir}
+cat > %{buildroot}%{_menudir}/%{name} << EOF
+?package(%{name}): command="stella" \
+icon="stella.xpm" \
+needs="x11" \
+title="Stella" \
+longtitle="A multi-platform Atari 2600 emulator" \
+section="Applications/Emulators"
+EOF
+
+%post
+%update_menus
+
+%postun
+%clean_menus
+
+%clean
+rm -rf %buildroot
+rm -rf $RPM_BUILD_DIR/%{name}-%{version}
+
+%files
+%defattr(-,root,root,-)
+%_bindir/*
+%{_menudir}/%{name}
+%_docdir/stella-%{version}/*
+%_datadir/icons/*
+/etc/stella.pro
+
+%changelog
+* Sun Oct 02 2005 Stephen Anthony <stephena@zarb.org> 2.0-1
+- Version 2.0 release, and plaform-agnostic SRPM (hopefully)
+
+* Sun Jul 31 2005 Stephen Anthony <stephena@zarb.org> 1.4.2-2plf
+- Recompile for distro name change
+
+* Sat Feb 19 2005 Stephen Anthony <stephena@zarb.org> 1.4.2-1plf
+- 1.4.2
+- First release of Stella 1.4.2 for PLF
+
+* Sat Apr 24 2004 Stefan van der Eijk <stefan@eijk.nu> 1.3-1plf
+- 1.3
+- remove stella sound, seems to be included?
+
+* Sun Nov 10 2002 Stefan van der Eijk <stefan@eijk.nu> 1.2-3plf
+- BuildRequires
+
+* Thu Oct 24 2002 Olivier Thauvin <thauvin@aerov.jussieu.fr> 1.2-2plf 
+-by Rob Kudla <rpm@kudla.org>
+	- doh!  forgot to build the sound server!
+
+* Wed Oct 22 2002 Rob Kudla <rpm@kudla.org> 1.2-1plf
+- oh yeah, I guess emulators go in plf
+
+* Tue Oct 22 2002 Rob Kudla <rpm@kudla.org> 1.2-1mdk
+- first attempt at package