From 54dd8f6742316570a0932361cf3d27c9b44d547a Mon Sep 17 00:00:00 2001 From: "Paul F. Johnson" Date: Fri, 13 Jan 2006 00:49:50 +0000 Subject: [PATCH] auto-import fuse-0.7.0-5 on branch devel from fuse-0.7.0-5.src.rpm --- .cvsignore | 2 +- README.z88sdk | 20 ++++++ fuse-README.fedora | 17 ----- fuse-emulator-0.7.0.spec | 108 ++++++++++++++++++++++++++++++ fuse-makedev.d-fuse | 1 - fuse-mount.fuse.patch | 23 ------- fuse-sound.patch | 13 ++++ fuse-udev.nodes | 1 - fuse-udev_rules.patch | 6 -- fuse.png | Bin 0 -> 3225 bytes fuse.spec | 140 --------------------------------------- sources | 2 +- 12 files changed, 143 insertions(+), 190 deletions(-) create mode 100644 README.z88sdk delete mode 100644 fuse-README.fedora create mode 100644 fuse-emulator-0.7.0.spec delete mode 100644 fuse-makedev.d-fuse delete mode 100644 fuse-mount.fuse.patch create mode 100644 fuse-sound.patch delete mode 100644 fuse-udev.nodes delete mode 100644 fuse-udev_rules.patch create mode 100644 fuse.png delete mode 100644 fuse.spec diff --git a/.cvsignore b/.cvsignore index 0870e75..771287f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -fuse-2.4.2.tar.gz +fuse-0.7.0.tar.gz diff --git a/README.z88sdk b/README.z88sdk new file mode 100644 index 0000000..dc79f20 --- /dev/null +++ b/README.z88sdk @@ -0,0 +1,20 @@ +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. + +Next, compile and target the ZX Spectrum + +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. + +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. + +That's about it! diff --git a/fuse-README.fedora b/fuse-README.fedora deleted file mode 100644 index 26034c2..0000000 --- a/fuse-README.fedora +++ /dev/null @@ -1,17 +0,0 @@ -This fuse package for security reasons only allows members of the group "fuse" -to (u)mount fuse filesystems. If you for example want to allow the user "foo" -to mount fuse filesystems you have to add him to the fuse group by running - -# /usr/sbin/usermod -a -G fuse foo - -Or use tools like "system-config-users" to add user "foo" to the fuse group. - -Note that the user has to re-login after he was added to the group. - - -If you don't want to add all users to the fuse group you can also run - -# chmod 4755 /usr/bin/fusermount - -to allow everyone to mount fuse filesystems. You have to re-run that command -after each fuse update. diff --git a/fuse-emulator-0.7.0.spec b/fuse-emulator-0.7.0.spec new file mode 100644 index 0000000..e7f7e1a --- /dev/null +++ b/fuse-emulator-0.7.0.spec @@ -0,0 +1,108 @@ +%define packagename fuse-emulator + +Summary: The Free UNIX Spectrum Emulator +Name: fuse +Version: 0.7.0 +Release: 5%{?dist} +License: GPL +Group: Applications/Emulators +Source: http://kent.dl.sourceforge.net/sourceforge/fuse-emulator/%{name}-%{version}.tar.gz +Source1: fuse.png +Source2: README.z88sdk +Patch: fuse-sound.patch +URL: http://fuse-emulator.sourceforge.net/ +BuildRoot: %{_tmppath}/%{packagename}-%{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. + +%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 +%patch -p1 -b sound.c + +%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 + +%clean +rm -rf ${RPM_BUILD_ROOT} + +%post + +%postun + +%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 + +%changelog +* Wed Oct 26 2005 Paul F. Johnson - 0.7.0-5 +- Altered package name to fuse-emulator (macro) +- Removed BR: zlib-devel and BR: glibc-devel and both Requires +- Included comment regarding the SRPM not containing the ROMS +- Added README.z88sdk file to the archive +- Made the source of the tarball a valid one! +- Removed a comma from after xml2-devel + +* Mon Oct 17 2005 Paul F. Johnson - 0.7.0-4 +- Minor alteration to spec file (Build require=perl gone) +- Addition of sound.c patch file + +* Fri Sep 02 2005 Paul F. Johnson - 0.7.0-3.fc +- Removal of ROMS and addition to documentation of where to get ROMS + +* Mon Aug 29 2005 Paul F. Johnson - 0.7.0-2.fc +- Fixes to both the source and spec for FC + +* Mon Feb 28 2005 Ian Chapman - 0.7.0-2.iss +- Rebuild for newer version of lib765 (0.3.3) + +* Mon Jul 16 2004 Ian Chapman - 0.7.0-1.iss +- Updated to version 0.7.0 +- Updated for Fedora Core 2 +- Added a graphic for the menu icon + +* Fri Dec 05 2003 Ian Chapman - 0.6.1.1-2 +- Minor fixes to changelog +- Improved use of macros +- Removed most explicit library dependancies +- Added menu icon + +* Sun Nov 30 2003 Ian Chapman - 0.6.1.1-1 +- Initial Release diff --git a/fuse-makedev.d-fuse b/fuse-makedev.d-fuse deleted file mode 100644 index c71ea7b..0000000 --- a/fuse-makedev.d-fuse +++ /dev/null @@ -1 +0,0 @@ -c 660 root fuse 10 229 1 1 fuse diff --git a/fuse-mount.fuse.patch b/fuse-mount.fuse.patch deleted file mode 100644 index 7901ee2..0000000 --- a/fuse-mount.fuse.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -u util.org/mount.fuse util/mount.fuse ---- util.org/mount.fuse 2005-11-02 20:52:12.000000000 +0100 -+++ util/mount.fuse 2005-11-02 20:59:51.000000000 +0100 -@@ -5,6 +5,7 @@ - # Thanks to Miklos Szeredi - # to kick me to the right way - # -+export PATH - - VERSION="0.0.1" - PRGNAME=`basename $0` -@@ -40,9 +41,9 @@ - shift - shift - --OPTIONS="$@" -+# If there is a better regex that can remove all user from a sting like "-o user,rw,noexec,user,nosuid,nodev,user" tell me, thx -+OPTIONS="`echo $@ | sed 's|,user$|| ; s| user,| | ; s|,user,|,|'`" - --export PATH - ${FSTYPE} ${MOUNTPATH} ${MOUNTPOINT} ${OPTIONS} - - diff --git a/fuse-sound.patch b/fuse-sound.patch new file mode 100644 index 0000000..330dd97 --- /dev/null +++ b/fuse-sound.patch @@ -0,0 +1,13 @@ +--- 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-udev.nodes b/fuse-udev.nodes deleted file mode 100644 index a517c48..0000000 --- a/fuse-udev.nodes +++ /dev/null @@ -1 +0,0 @@ -fuse diff --git a/fuse-udev_rules.patch b/fuse-udev_rules.patch deleted file mode 100644 index d641c4a..0000000 --- a/fuse-udev_rules.patch +++ /dev/null @@ -1,6 +0,0 @@ -diff -u util.org/udev.rules util/udev.rules ---- util.org/udev.rules 2005-11-03 19:38:05.000000000 +0100 -+++ util/udev.rules 2005-11-03 19:38:13.000000000 +0100 -@@ -1 +1 @@ --KERNEL="fuse", NAME="%k", MODE="0666" -+KERNEL="fuse", NAME="%k", MODE="0660",OWNER="root" GROUP="fuse" diff --git a/fuse.png b/fuse.png new file mode 100644 index 0000000000000000000000000000000000000000..d0a89c559e9aa05f698c743faabc35ad2278c14f GIT binary patch literal 3225 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 2.6.14 -Requires(pre): %{_sbindir}/groupadd -Requires(post): /sbin/MAKEDEV -Requires(postun): %{_sbindir}/groupdel - -%description -With FUSE it is possible to implement a fully functional filesystem in a -userspace program. This package contains the FUSE userspace tools to -mount a FUSE filesystem. - -Note: For security reasons only members of the group "fuse" are allowed to -(u)mount fuse filesystems. You can find more details on this issue in -%{_docdir}/%{name}-%{version}/README.fedora - - -%package libs -Summary: File System in Userspace (FUSE) libraries -Group: System Environment/Libraries -License: LGPL - -%description libs -Devel With FUSE it is possible to implement a fully functional filesystem in a -userspace program. This package contains the FUSE libraries. - - -%package devel -Summary: File System in Userspace (FUSE) devel files -Group: Development/Libraries -Requires: %{name}-libs = %{version}-%{release} -License: LGPL - -%description devel -With FUSE it is possible to implement a fully functional filesystem in a -userspace program. This package contains development files (headers, -pgk-config) to develop FUSE based applications/filesystems. - - -%prep -%setup -q -#disable device creation during build/install -sed -i 's|mknod|echo Disabled: mknod |g' util/Makefile.in -%patch0 -b .patch0 -%patch1 -b .patch1 -cp %{SOURCE3} README.fedora - -%build -%configure \ - --disable-static \ - --disable-kernel-module -make %{?_smp_mflags} - - -%install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT -find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' -install -D -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/udev/makedev.d/40-fuse.nodes -install -D -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/makedev.d/z-fuse -# change from 4755 to 0755 to allow stripping -- fixed later in files -chmod 0755 $RPM_BUILD_ROOT/%{_bindir}/fusermount - - -%clean -rm -rf $RPM_BUILD_ROOT - -%pre -if [ $1 -eq 1 ]; then - %{_sbindir}/groupadd -r fuse &>/dev/null || : -fi - -%post -/sbin/MAKEDEV fuse - -%postun -if [ $1 = 0 ]; then - %{_sbindir}/groupdel fuse || : -fi - -%post libs -p /sbin/ldconfig - -%postun libs -p /sbin/ldconfig - - -%files -%doc AUTHORS ChangeLog COPYING FAQ Filesystems NEWS README README.NFS README.fedora -/sbin/mount.fuse -%attr(4754,root,fuse) %{_bindir}/fusermount -%{_sysconfdir}/makedev.d/z-fuse -%{_sysconfdir}/udev/rules.d/40-fuse.rules -%{_sysconfdir}/udev/makedev.d/40-fuse.nodes - -%files libs -%doc COPYING.LIB -%{_libdir}/libfuse.so.* - -%files devel -%defattr(-,root,root,-) -%{_libdir}/libfuse.so -%{_libdir}/pkgconfig/*.pc -%{_includedir}/fuse.h -%{_includedir}/fuse - -%changelog -* Wed Nov 23 2005 Thorsten Leemhuis - 2.4.2-1 -- Use dist - -* Wed Nov 23 2005 Thorsten Leemhuis - 2.4.2-1 -- Update to 2.4.2 (solves CVE-2005-3531) -- Update README.fedora - -* Sat Nov 12 2005 Thorsten Leemhuis - 2.4.1-3 -- Add README.fedora -- Add hint to README.fedora and that you have to be member of the group "fuse" - in the description -- Use groupadd instead of fedora-groupadd - -* Fri Nov 04 2005 Thorsten Leemhuis - 2.4.1-2 -- Rename packages a bit -- use makedev.d/40-fuse.nodes -- fix /sbin/mount.fuse -- Use a fuse group to restict access to fuse-filesystems - -* Fri Oct 28 2005 Thorsten Leemhuis - 2.4.1-1 -- Initial RPM release. diff --git a/sources b/sources index af3a9a6..63e5a2f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6e3d9a580c45ddf4a06558c135c158c2 fuse-2.4.2.tar.gz +ebb124e808e6467630efaae01fe03b64 fuse-0.7.0.tar.gz