X-Git-Url: http://git.pld-linux.org/?p=packages%2FSTonX.git;a=blobdiff_plain;f=STonX.spec;h=2479445ccc6cba807bf22514574b3c8ee00aed6a;hp=0d700a34b8631055a6b851d626d39289a7354c10;hb=HEAD;hpb=ad688694c2909eebfb70e34d3480b35fb09346ed

diff --git a/STonX.spec b/STonX.spec
index 0d700a3..2479445 100644
--- a/STonX.spec
+++ b/STonX.spec
@@ -1,60 +1,61 @@
 #
 # Conditional build:
-# _without_svga		without svgalib support
+%bcond_without	svga	# without svgalib support
 #
-
-%ifnarch %{ix86}
-%define _without_svga 1
-%endif
-
 %define		tosarchname	tos206us.zip
 %define		tosfilename	Tos206.img
 
 Summary:	Atari ST on Unix/X
-Summary(pl):	Atari ST pod Uniksem/X
+Summary(pl.UTF-8):	Atari ST pod Uniksem/X
 Name:		STonX
 Version:	0.6.5
-Release:	1
+Release:	2
 License:	GPL (except TOS image)
 Group:		Applications/Emulators
 Source0:	http://www.complang.tuwien.ac.at/nino/stonx/%{name}-%{version}.tar.gz
+# Source0-md5:	54ce49f5a64f0e7779000245a9b903a6
 # to use TOS image legally, one probably must own real Atari ST...
 Source1:	%{tosarchname}
 NoSource:	1
 Patch0:		%{name}-nox.patch
 Patch1:		%{name}-svga.patch
+Patch2:		%{name}-link.patch
+Patch3:		%{name}-segv.patch
 URL:		http://www.complang.tuwien.ac.at/nino/stonx.html
-BuildRequires:	XFree86-devel
-%{!?_without_svga:BuildRequires:	svgalib-devel}
-BuildRequires:	autoconf
+BuildRequires:	autoconf >= 2.59-9
+BuildRequires:	rpmbuild(macros) >= 1.268
+%{?with_svga:BuildRequires:	svgalib-devel}
 BuildRequires:	unzip
+BuildRequires:	xorg-lib-libXext-devel
+Requires(post,postun):	fontpostinst
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_prefix		/usr/X11R6
-
 %description
 STonX is a software emulator, which runs on Unix workstations with the
-X Window system%{!?_without_svga: or svgalib}, and emulates an Atari ST computer.
+X Window system%{?with_svga: or svgalib}, and emulates an Atari ST
+computer.
 
-%description -l pl
-STonX jest programowym emulatorem komputera Atari ST, dzia³aj±cym na
-Uniksach z X Window System%{!?_without_svga: lub svgalib}.
+%description -l pl.UTF-8
+STonX jest programowym emulatorem komputera Atari ST, działającym na
+Uniksach z X Window System%{?with_svga: lub svgalib}.
 
 %prep
 %setup -q -a1
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 mv -f %{tosfilename} tos.img
 
 %build
-autoconf
+%{__autoconf}
 %configure
 
 %{__make} \
 	OPT="%{rpmcflags}" \
 	REGS="%{!?debug:-fomit-frame-pointer}" \
-	%{!?_without_svga:USE_SVGALIB=1}
+	%{?with_svga:USE_SVGALIB=1}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -65,41 +66,29 @@ install stonx tos.img cartridge.img Keysyms $RPM_BUILD_ROOT%{_libdir}/STonX
 gzip -9nf data/*.pcf
 install data/*.pcf.gz $RPM_BUILD_ROOT%{_fontsdir}/misc
 
-cat > $RPM_BUILD_ROOT%{_bindir}/stonx <<EOF
+cat > $RPM_BUILD_ROOT%{_bindir}/stonx <<'EOF'
 #!/bin/sh
 cd %{_libdir}/STonX
 
-%{!?_without_svga:if [ -z "\$DISPLAY" ]; then exec ./stonx -svga ; fi}
+%{?with_svga:if [ -z "$DISPLAY" ]; then exec ./stonx -svga ; fi}
 exec ./stonx
 EOF
 
-gzip -9nf docs/{PROGRAMS,README,RELEASE_NOTES,TOS-VERSIONS}
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-if [ -x /usr/X11R6/bin/mkfontdir ]; then
-	(cd /usr/share/fonts/misc; /usr/X11R6/bin/mkfontdir)
-fi
-if [ -f /var/lock/subsys/xfs ]; then
-	/etc/rc.d/init.d/xfs reload
-fi
+fontpostinst misc
 
 %postun
-if [ -x /usr/X11R6/bin/mkfontdir ]; then
-	(cd /usr/share/fonts/misc; /usr/X11R6/bin/mkfontdir)
-fi
-if [ -f /var/lock/subsys/xfs ]; then
-	/etc/rc.d/init.d/xfs reload
-fi
+fontpostinst misc
 
 %files
 %defattr(644,root,root,755)
-%doc docs/*.gz
+%doc docs/{PROGRAMS,README,RELEASE_NOTES,TOS-VERSIONS}
 %attr(755,root,root) %{_bindir}/*
 %dir %{_libdir}/STonX
 %attr(755,root,root) %{_libdir}/STonX/stonx
 %{_libdir}/STonX/*.img
 %{_libdir}/STonX/Keysyms
-%{_fontsdir}/misc/*
+%{_fontsdir}/misc/*.pcf.gz