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

diff --git a/STonX.spec b/STonX.spec
index a33db44..2479445 100644
--- a/STonX.spec
+++ b/STonX.spec
@@ -6,10 +6,10 @@
 %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
@@ -19,12 +19,15 @@ 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
-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)
 
 %description
@@ -32,14 +35,16 @@ STonX is a software emulator, which runs on Unix workstations with the
 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
+%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
 
@@ -73,16 +78,10 @@ EOF
 rm -rf $RPM_BUILD_ROOT
 
 %post
-if [ -x /usr/X11R6/bin/mkfontdir ]; then
-	(cd /usr/share/fonts/misc; /usr/X11R6/bin/mkfontdir)
-fi
-%service -q xfs reload
+fontpostinst misc
 
 %postun
-if [ -x /usr/X11R6/bin/mkfontdir ]; then
-	(cd /usr/share/fonts/misc; /usr/X11R6/bin/mkfontdir)
-fi
-%service -q xfs reload
+fontpostinst misc
 
 %files
 %defattr(644,root,root,755)
@@ -92,4 +91,4 @@ fi
 %attr(755,root,root) %{_libdir}/STonX/stonx
 %{_libdir}/STonX/*.img
 %{_libdir}/STonX/Keysyms
-%{_fontsdir}/misc/*
+%{_fontsdir}/misc/*.pcf.gz