diff --git a/.cvsignore b/.cvsignore index 771287f..96086e1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -fuse-0.7.0.tar.gz +fuse-0.8.0.1.tar.gz diff --git a/README.z88sdk b/README.z88sdk index dc79f20..04b5548 100644 --- a/README.z88sdk +++ b/README.z88sdk @@ -1,7 +1,8 @@ HOW TO USE THE Z88SDK WITH FUSE ------------------------------- -Using the Z88 SDK with fuse is a very simple operation. Grab a copy of the rpm, install and write your code, as you would, in C. +Using the Z88 SDK with fuse is a very simple operation. Grab a copy of the rpm, +install and write your code, as you would, in C. Next, compile and target the ZX Spectrum @@ -9,12 +10,17 @@ zcc +zx .c -o .bin -lndos Assuming all is well, your code will be generated. THIS IS NOT AN EXECUTABLE! -Load up Fuse. Click on File, move to "Open Binary Data". The usual filer window opens. Select the file you've just compiled and click "Open". The filer closes and you're presented with another window asking for a start address. You can enter any number from about 25000. For this explaination, I would use 32768. Click OK. Your .bin file is now in memory. +Load up Fuse. Click on File, move to "Open Binary Data". The usual filer window +opens. Select the file you've just compiled and click "Open". The filer closes +and you're presented with another window asking for a start address. You can +enter any number from about 25000. For this explaination, I will use 32768. +Click OK. Your .bin file is now in memory. To run the code, press the following keys T, ctrl + shift (the cursor turns to a white on black E), L 32768 return. -On screen you will see the words RANDOMISE USR 32768 before you press return. When you press return, the code will be executed. +On screen you will see the words RANDOMISE USR 32768 before you press return. +When you press return, the code will be executed. That's about it! diff --git a/README_fuseroms.fedora b/README_fuseroms.fedora new file mode 100644 index 0000000..5439b86 --- /dev/null +++ b/README_fuseroms.fedora @@ -0,0 +1,6 @@ +Note +---- + +Due to Fedora policy, this version has been packaged WITHOUT the ROMs. These +are available from a 3rd party repository http://dribble.org.uk as an RPM, +or from the original Fuse site at: http://fuse-emulator.sourceforge.net diff --git a/fuse-emulator.spec b/fuse-emulator.spec index 59517ef..f197093 100644 --- a/fuse-emulator.spec +++ b/fuse-emulator.spec @@ -1,71 +1,76 @@ -Summary: The Free UNIX Spectrum Emulator -Name: fuse-emulator -Version: 0.7.0 -Release: 6%{?dist} -License: GPL -Group: Applications/Emulators -Source: http://kent.dl.sourceforge.net/sourceforge/fuse-emulator/fuse-%{version}.tar.gz -Source1: fuse.png -Source2: README.z88sdk -Patch: fuse-sound.patch -URL: http://fuse-emulator.sourceforge.net/ -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libdsk-devel -BuildRequires: lib765-devel -BuildRequires: gtk2-devel -BuildRequires: libxml2-devel -BuildRequires: libpng-devel -BuildRequires: libspectrum-devel -BuildRequires: bison -BuildRequires: flex - -# The SRPM created from this spec file deliberately does not include the -# ROMS required to run the emulator. For the location of the ROMS, see -# the ROMS readme file. +Name: fuse-emulator +Version: 0.8.0.1 +Release: 1%{?dist} +Summary: The Free UNIX Spectrum Emulator +Group: Applications/Emulators +License: GPL +URL: http://fuse-emulator.sourceforge.net +Source0: http://dl.sf.net/fuse-emulator/fuse-%{version}.tar.gz +# The source has deliberately had the ROMS removed. For the location of the +# ROMS, please see the ROMS readme file. +Source1: fuse.png +Source2: README.z88sdk +Source3: README_fuseroms.fedora +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: gtk2-devel +BuildRequires: lib765-devel +BuildRequires: libdsk-devel +BuildRequires: libICE-devel +BuildRequires: libpng-devel +BuildRequires: libspectrum-devel >= 0.3.0.1 +BuildRequires: libxml2-devel +BuildRequires: bison +BuildRequires: flex +Requires: hicolor-icon-theme %description Fuse is a spectrum emulator which emulates multiple models, including the 16K, 48K, 128K, +2, +2A, +3 and various clones. + %prep -rm -rf ${RPM_BUILD_ROOT} -%setup -q -n fuse-%{version} -%patch -p1 -b sound.c +%setup -qn fuse-%{version} + %build %configure make %{?_smp_mflags} + %install -rm -rf ${RPM_BUILD_ROOT} -mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1 -mkdir -p ${RPM_BUILD_ROOT}%{_bindir} -mkdir -p ${RPM_BUILD_ROOT}%{_libdir} -mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/fuse -mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/applications -mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/pixmaps - -install -m0644 man/fuse.1 ${RPM_BUILD_ROOT}%{_mandir}/man1 - -install -c fuse ${RPM_BUILD_ROOT}%{_bindir}/fuse -cp lib/*.z80 ${RPM_BUILD_ROOT}%{_datadir}/fuse/ -cp lib/*.bmp ${RPM_BUILD_ROOT}%{_datadir}/fuse/ -cp lib/*.scr ${RPM_BUILD_ROOT}%{_datadir}/fuse/ -install -m0755 %{SOURCE1} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}.png -cp %{SOURCE2} README.z88sdk +rm -rf %{buildroot} +mkdir -p %{buildroot}%{_bindir} +mkdir -p %{buildroot}%{_mandir}/man1 +mkdir -p %{buildroot}%{_datadir}/fuse +mkdir -p %{buildroot}%{_datadir}/icons/hicolor/64x64/apps + +install -pm0755 fuse %{buildroot}%{_bindir}/fuse +install -pm0644 man/fuse.1 %{buildroot}%{_mandir}/man1 +install -pm0644 lib/*.bmp lib/*.scr %{buildroot}%{_datadir}/fuse/ +cp -a lib/compressed lib/uncompressed %{buildroot}%{_datadir}/fuse/ +install -pm0644 %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/%{name}.png +install -pm0644 %{SOURCE2} . +install -pm0644 %{SOURCE3} . + %clean -rm -rf ${RPM_BUILD_ROOT} +rm -rf %{buildroot} + %files %defattr(-,root,root) %{_mandir}/man1/fuse.1.gz %{_bindir}/fuse -%{_datadir}/fuse/ -%{_datadir}/pixmaps/%{name}.png -%doc AUTHORS ChangeLog COPYING README THANKS ROMS README.z88sdk +%{_datadir}/fuse +%{_datadir}/icons/hicolor/64x64/apps/%{name}.png +%doc AUTHORS ChangeLog COPYING README THANKS README.z88sdk README_fuseroms.fedora + %changelog +* Sat Jun 30 2007 Ian Chapman 0.8.0.1-1%{?dist} +- Upgrade to 0.8.0.1 +- Various cleanups to the SPEC including conforming to new guidelines + * Thu Feb 9 2006 Paul F. Johnson - 0.7.0-6 - Removed pre and post as they were empty - Fixed the "fuse-emulator" problem diff --git a/fuse-sound.patch b/fuse-sound.patch deleted file mode 100644 index 330dd97..0000000 --- a/fuse-sound.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- sound.c 2005-10-17 23:20:45.000000000 +0100 -+++ fuse-0.7.0/sound.c 2005-08-20 23:46:32.000000000 +0100 -@@ -58,8 +58,8 @@ - int sound_stereo_ay_abc=0; /* (AY stereo) true for ABC stereo, else ACB */ - int sound_stereo_ay_narrow=0; /* (AY stereo) true for narrow AY st. sep. */ - --static int sound_stereo_ay=0; /* local copy of settings_current.stereo_ay */ --static int sound_stereo_beeper=0; /* and settings_current.stereo_beeper */ -+int sound_stereo_ay=0; /* local copy of settings_current.stereo_ay */ -+int sound_stereo_beeper=0; /* and settings_current.stereo_beeper */ - - - /* assume all three tone channels together match the beeper volume (ish). diff --git a/fuse.png b/fuse.png index d0a89c5..9bc9879 100644 Binary files a/fuse.png and b/fuse.png differ diff --git a/sources b/sources index 63e5a2f..b8bad24 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ebb124e808e6467630efaae01fe03b64 fuse-0.7.0.tar.gz +1f939c4d35dfa195cccc64d3f31c6c0e fuse-0.8.0.1.tar.gz