- update to 0.6.0 by Witold Filipczyk +

- s/Wolny/Darmowy/, cosmetics

Changed files:
    fuse.spec -> 1.11

diff --git a/fuse.spec b/fuse.spec
index 3bc5689ba1bc37afd224ca5cee95047c1a025537..d51a585e9a83d708a4d2c37d39e724d3ea070a83 100644 (file)
--- a/fuse.spec
+++ b/fuse.spec
@@ -1,24 +1,30 @@
+# Conditional build:
+# _without_svga - don't build svgalib version
+# _without_x11 - don't build X11 version
+# _without_fb - don't build framebuffer version
+# _without_sdl - don't build SDL version
+
 Summary:       Free Unix Spectrum Emulator
-Summary(pl):   "Wolny" uniksowy emulator ZX Spectrum
+Summary(pl):   Darmowy uniksowy emulator ZX Spectrum
 Name:          fuse
-Version:       0.5.1
-Release:       2
+Version:       0.6.0
+Release:       1
 License:       GPL
 Group:         Applications/Emulators
 Source0:       http://www.srcf.ucam.org/~pak21/spectrum/%{name}-%{version}.tar.gz
-Patch0:                %{name}-typo.patch
-Patch1:     %{name}-tmx.patch
 URL:           http://www.srcf.ucam.org/~pak21/spectrum/fuse.html
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires:  gtk+-devel
-BuildRequires: libspectrum-devel
+%{!?_without_x11:BuildRequires:        gtk+-devel}
+BuildRequires: lib765-devel
+BuildRequires: libpng-devel
+BuildRequires: libspectrum-devel >= 0.1.1
+BuildRequires: libxml2-devel
 BuildRequires: perl
-BuildRequires:  libxml2-devel
+%{!?_without_sdl:BuildRequires:        SDL-devel}
 %ifarch %{ix86} alpha ppc
-BuildRequires: svgalib-devel
+%{!?_without_svga:BuildRequires:       svgalib-devel}
 %endif
-BuildRequires: XFree86-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -42,7 +48,7 @@ Jego w
 
 %package common
 Summary:       Free Unix Spectrum Emulator (common files)
-Summary(pl):   "Wolny" uniksowy emulator ZX Spectrum (pliki wspólne)
+Summary(pl):   Darmowy uniksowy emulator ZX Spectrum (pliki wspólne)
 Group:         Applications/Emulators
 
 %description common
@@ -69,9 +75,10 @@ Jego w
 
 W tym pakiecie znajduj± siê wspólne pliki dla wersji X11 i svga.
 
+%if %{!?_without_fb:1}0
 %package fb
 Summary:       Free Unix Spectrum Emulator (framebuffer version)
-Summary(pl):   "Wolny" uniksowy emulator ZX Spectrum (wersja na framebuffer)
+Summary(pl):   Darmowy uniksowy emulator ZX Spectrum (wersja na framebuffer)
 Group:         Applications/Emulators
 Requires:      %{name}-common = %{version}
 
@@ -97,10 +104,44 @@ Jego w
 * D¼wiêk.
 
 W tym pakiecie znajduj± siê pliki dla wersji korzystaj±cej z framebuffera. 
+%endif
+
+%if %{!?_without_sdl:1}0
+%package sdl
+Summary:       Free Unix Spectrum Emulator (SDL version)
+Summary(pl):   Darmowy uniksowy emulator ZX Spectrum (wersja na SDL)
+Group:         Applications/Emulators
+Requires:      %{name}-common = %{version}
+
+%description sdl
+fuse is Free Unix Spectrum Emulator.
+What Fuse does have:
+
+* Working 48K/128K/+2/+2A Speccy emulation, running at true Speccy
+  speed on any computer you're likely to try it on (it runs at full
+  speed on a SparcStation 4 unless you do too much graphics intensive
+  stuff).
+* Support for loading from .tzx files.
+* Sound.
+
+This package contains files for SDL version.
+
+%description sdl -l pl
+fuse (Free Unix Spectrum Emulator) jest emulatorem ZX Spectrum.
+Jego w³a¶ciwo¶ci to:
+
+* Emulacja ZX Spectrum 48K/128K/+2/+2A.
+* Mo¿liwo¶æ ³adowania programów z plików .tzx.
+* D¼wiêk.
+
+W tym pakiecie znajduj± siê pliki dla wersji korzystaj±cej z SDL. 
+
+%endif
 
+%if %{!?_without_svga:1}0
 %package svga
 Summary:       Free Unix Spectrum Emulator (svga version)
-Summary(pl):   "Wolny" uniksowy emulator ZX Spectrum (wersja na svgalib)
+Summary(pl):   Darmowy uniksowy emulator ZX Spectrum (wersja na svgalib)
 Group:         Applications/Emulators
 Requires:      %{name}-common = %{version}
 
@@ -127,9 +168,12 @@ Jego w
 
 W tym pakiecie znajduj± siê pliki dla wersji korzystaj±cej z svgalib. 
 
+%endif
+
+%if %{!?_without_x11:1}0
 %package X11
 Summary:       Free Unix Spectrum Emulator (X11 version)
-Summary(pl):   "Wolny" uniksowy emulator ZX Spectrum (wersja na XWindow)
+Summary(pl):   Darmowy uniksowy emulator ZX Spectrum (wersja na XWindow)
 Group:         Applications/Emulators
 Requires:      %{name}-common = %{version}
 
@@ -156,56 +200,66 @@ Jego w
 
 W tym pakiecie znajduj± siê pliki dla wersji X11.
 
+%endif
+
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p0
 
 %build
 rm -f missing
 %{__aclocal}
+%{__autoheader}
 %{__autoconf}
 %{__automake}
-# version for X11
+
+# X11
+%if %{!?_without_x11:1}0
 %configure  \
-       --with-x \
-       --with-glib \
-       --without-svgalib \
-       --without-fb
+       --with-gtk
 %{__make} clean
 %{__make}
 cp -f ./fuse ./fuse-x11
+%endif
 
-#version for svga
-%ifarch %{ix86} alpha ppc
+# SDL
+%if %{!?_without_sdl:1}0
+%configure \
+       --with-sdl
 %{__make} clean
+%{__make}
+cp -f ./fuse ./fuse-sdl
+%endif
+
+# svga
+%ifarch %{ix86} alpha ppc
+%if %{!?_without_svga:1}0
 %configure \
-       --without-x \
-       --with-glib \
-       --without-fb \
        --with-svgalib
-%{__make} CFLAGS="-I/usr/include/glib-1.2 -I/usr/lib/glib/include %{rpmcflags}"
+%{__make} clean
+%{__make}
 cp -f ./fuse ./fuse-svga
 %endif
+%endif
 
-%{__make} clean
+# framebuffer
+%if %{!?_without_fb:1}0
 %configure \
-       --without-x \
-       --with-glib \
-       --with-fb \
-       --without-svgalib
-%{__make} CFLAGS="-I/usr/include/glib-1.2 -I/usr/lib/glib/include %{rpmcflags}"
+       --with-fb
+%{__make} clean
+%{__make}
 cp -f ./fuse ./fuse-fb
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 %ifarch %{ix86} alpha ppc
-install fuse-svga $RPM_BUILD_ROOT%{_bindir}
+%{!?_without_svga:install fuse-svga    $RPM_BUILD_ROOT%{_bindir}}
 %endif
-install fuse-x11 $RPM_BUILD_ROOT%{_bindir}
-install fuse-fb  $RPM_BUILD_ROOT%{_bindir}
+%{!?_without_x11:install fuse-x11      $RPM_BUILD_ROOT%{_bindir}}
+%{!?_without_fb:install  fuse-fb       $RPM_BUILD_ROOT%{_bindir}}
+%{!?_without_sdl:install fuse-sdl      $RPM_BUILD_ROOT%{_bindir}}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -217,16 +271,28 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/*
 %{_mandir}/man1/*
 
+%if %{!?_without_fb:1}0
 %files fb
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/fuse-fb
+%endif
+
+%if %{!?_without_sdl:1}0
+%files sdl
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/fuse-sdl
+%endif
 
 %ifarch %{ix86} alpha ppc
+%if %{!?_without_svga:1}0
 %files svga
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/fuse-svga
 %endif
+%endif
 
+%if %{!?_without_x11:1}0
 %files X11
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/fuse-x11
+%endif