X-Git-Url: http://git.pld-linux.org/?p=packages%2FXFree86-fonts-dos.git;a=blobdiff_plain;f=XFree86-fonts-dos.spec;h=cffabf25dd830a8be538e3f3a4c1eaf4e33c8530;hp=32674b585d80cfe067f6f8b1779706764db024ed;hb=HEAD;hpb=5a306e5e3b92af38040f72b10baecff59d55d4d6

diff --git a/XFree86-fonts-dos.spec b/XFree86-fonts-dos.spec
index 32674b5..cffabf2 100644
--- a/XFree86-fonts-dos.spec
+++ b/XFree86-fonts-dos.spec
@@ -1,217 +1,234 @@
-
-%define		_prefix		/usr/X11R6
-
-Summary:	XFree86 misc fonts with DOS encodings 
-Summary(pl):	Fonty misc z DOSowym kodowaniem
+Summary:	XFree86 misc fonts with DOS encodings
+Summary(pl.UTF-8):	Fonty misc z DOS-owym kodowaniem
 Name:		XFree86-fonts-dos
 Version:	4.2.0
-Release:	2
+Release:	4
 License:	Public Domain
-Group:		X11/XFree86
+Group:		Fonts
 Source0:	XFree86-fonts-misc-%{version}.tar.bz2
+# Source0-md5:	cbadfe4e784653b2795def646b905fb4
 Source1:	%{name}-maps.tar.bz2
+# Source1-md5:	edd71dbe130ae9ce39704ee2ee9e185e
 Source2:	%{name}-Mazovia.map
 BuildRequires:	XFree86-fonts-utils
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		_prefix		/usr/X11R6
+
 %description
 This package contains fixed fonts with DOS encodings.
 Fonts were taken from XFree86.
 
-%description -l pl
-Pakiet ten zawiera czcionki fixed z DOSowym kodowaniem.
-Fonty zosta³y wziête z dystrybucji XFree86.
+%description -l pl.UTF-8
+Pakiet ten zawiera czcionki fixed z DOS-owym kodowaniem.
+Fonty zostały wzięte z dystrybucji XFree86.
 
 %package -n XFree86-fonts-CP737
 Summary:	Fixed CP737 fonts
-Summary(pl):	Fonty rastrowe CP737
-Group:		X11/XFree86
-Requires(post,postun):	%{_bindir}/mkfontdir
+Summary(pl.UTF-8):	Fonty rastrowe CP737
+Group:		Fonts
+Requires(post,postun):	fontpostinst
+Requires:	%{_fontsdir}/misc
 
 %description -n XFree86-fonts-CP737
 This package contains fixed fonts with CP737 encoding.
 
-%description -n XFree86-fonts-CP737 -l pl
+%description -n XFree86-fonts-CP737 -l pl.UTF-8
 Pakiet ten zawiera czcionki fixed z kodowaniem CP737.
 
 %package -n XFree86-fonts-CP775
 Summary:	Fixed CP775 fonts
-Summary(pl):	Fonty rastrowe CP775
-Group:		X11/XFree86
-Requires(post,postun):	%{_bindir}/mkfontdir
+Summary(pl.UTF-8):	Fonty rastrowe CP775
+Group:		Fonts
+Requires(post,postun):	fontpostinst
+Requires:	%{_fontsdir}/misc
 
 %description -n XFree86-fonts-CP775
 This package contains fixed fonts with CP775 encoding.
 
-%description -n XFree86-fonts-CP775 -l pl
+%description -n XFree86-fonts-CP775 -l pl.UTF-8
 Pakiet ten zawiera czcionki fixed z kodowaniem CP775.
 
 %package -n XFree86-fonts-CP850
 Summary:	Fixed CP850 fonts
-Summary(pl):	Fonty rastrowe CP850
-Group:		X11/XFree86
-Requires(post,postun):	%{_bindir}/mkfontdir
+Summary(pl.UTF-8):	Fonty rastrowe CP850
+Group:		Fonts
+Requires(post,postun):	fontpostinst
+Requires:	%{_fontsdir}/misc
 
 %description -n XFree86-fonts-CP850
 This package contains fixed fonts with CP850 encoding.
 
-%description -n XFree86-fonts-CP850 -l pl
+%description -n XFree86-fonts-CP850 -l pl.UTF-8
 Pakiet ten zawiera czcionki fixed z kodowaniem CP850.
 
 %package -n XFree86-fonts-CP852
 Summary:	Fixed CP852 fonts
-Summary(pl):	Fonty rastrowe CP852
-Group:		X11/XFree86
-Requires(post,postun):	%{_bindir}/mkfontdir
+Summary(pl.UTF-8):	Fonty rastrowe CP852
+Group:		Fonts
+Requires(post,postun):	fontpostinst
+Requires:	%{_fontsdir}/misc
 
 %description -n XFree86-fonts-CP852
 This package contains fixed fonts with CP852 encoding.
 
-%description -n XFree86-fonts-CP852 -l pl
+%description -n XFree86-fonts-CP852 -l pl.UTF-8
 Pakiet ten zawiera czcionki fixed z kodowaniem CP852.
 
 %package -n XFree86-fonts-CP855
 Summary:	Fixed CP855 fonts
-Summary(pl):	Fonty rastrowe CP855
-Group:		X11/XFree86
-Requires(post,postun):	%{_bindir}/mkfontdir
+Summary(pl.UTF-8):	Fonty rastrowe CP855
+Group:		Fonts
+Requires(post,postun):	fontpostinst
+Requires:	%{_fontsdir}/misc
 
 %description -n XFree86-fonts-CP855
 This package contains fixed fonts with CP855 encoding.
 
-%description -n XFree86-fonts-CP855 -l pl
+%description -n XFree86-fonts-CP855 -l pl.UTF-8
 Pakiet ten zawiera czcionki fixed z kodowaniem CP855.
 
 %package -n XFree86-fonts-CP857
 Summary:	Fixed CP857 fonts
-Summary(pl):	Fonty rastrowe CP857
-Group:		X11/XFree86
-Requires(post,postun):	%{_bindir}/mkfontdir
+Summary(pl.UTF-8):	Fonty rastrowe CP857
+Group:		Fonts
+Requires(post,postun):	fontpostinst
+Requires:	%{_fontsdir}/misc
 
 %description -n XFree86-fonts-CP857
 This package contains fixed fonts with CP857 encoding.
 
-%description -n XFree86-fonts-CP857 -l pl
+%description -n XFree86-fonts-CP857 -l pl.UTF-8
 Pakiet ten zawiera czcionki fixed z kodowaniem CP857.
 
 %package -n XFree86-fonts-CP860
 Summary:	Fixed CP860 fonts
-Summary(pl):	Fonty rastrowe CP860
-Group:		X11/XFree86
-Requires(post,postun):	%{_bindir}/mkfontdir
+Summary(pl.UTF-8):	Fonty rastrowe CP860
+Group:		Fonts
+Requires(post,postun):	fontpostinst
+Requires:	%{_fontsdir}/misc
 
 %description -n XFree86-fonts-CP860
 This package contains fixed fonts with CP860 encoding.
 
-%description -n XFree86-fonts-CP860 -l pl
+%description -n XFree86-fonts-CP860 -l pl.UTF-8
 Pakiet ten zawiera czcionki fixed z kodowaniem CP860.
 
 %package -n XFree86-fonts-CP861
 Summary:	Fixed CP861 fonts
-Summary(pl):	Fonty rastrowe CP861
-Group:		X11/XFree86
-Requires(post,postun):	%{_bindir}/mkfontdir
+Summary(pl.UTF-8):	Fonty rastrowe CP861
+Group:		Fonts
+Requires(post,postun):	fontpostinst
+Requires:	%{_fontsdir}/misc
 
 %description -n XFree86-fonts-CP861
 This package contains fixed fonts with CP861 encoding.
 
-%description -n XFree86-fonts-CP861 -l pl
+%description -n XFree86-fonts-CP861 -l pl.UTF-8
 Pakiet ten zawiera czcionki fixed z kodowaniem CP861.
 
 %package -n XFree86-fonts-CP862
 Summary:	Fixed CP862 fonts
-Summary(pl):	Fonty rastrowe CP862
-Group:		X11/XFree86
-Requires(post,postun):	%{_bindir}/mkfontdir
+Summary(pl.UTF-8):	Fonty rastrowe CP862
+Group:		Fonts
+Requires(post,postun):	fontpostinst
+Requires:	%{_fontsdir}/misc
 
 %description -n XFree86-fonts-CP862
 This package contains fixed fonts with CP862 encoding.
 
-%description -n XFree86-fonts-CP862 -l pl
+%description -n XFree86-fonts-CP862 -l pl.UTF-8
 Pakiet ten zawiera czcionki fixed z kodowaniem CP862.
 
 %package -n XFree86-fonts-CP863
 Summary:	Fixed CP863 fonts
-Summary(pl):	Fonty rastrowe CP863
-Group:		X11/XFree86
-Requires(post,postun):	%{_bindir}/mkfontdir
+Summary(pl.UTF-8):	Fonty rastrowe CP863
+Group:		Fonts
+Requires(post,postun):	fontpostinst
+Requires:	%{_fontsdir}/misc
 
 %description -n XFree86-fonts-CP863
 This package contains fixed fonts with CP863 encoding.
 
-%description -n XFree86-fonts-CP863 -l pl
+%description -n XFree86-fonts-CP863 -l pl.UTF-8
 Pakiet ten zawiera czcionki fixed z kodowaniem CP863.
 
 %package -n XFree86-fonts-CP864
 Summary:	Fixed CP864 fonts
-Summary(pl):	Fonty rastrowe CP864
-Group:		X11/XFree86
-Requires(post,postun):	%{_bindir}/mkfontdir
+Summary(pl.UTF-8):	Fonty rastrowe CP864
+Group:		Fonts
+Requires(post,postun):	fontpostinst
+Requires:	%{_fontsdir}/misc
 
 %description -n XFree86-fonts-CP864
 This package contains fixed fonts with CP864 encoding.
 
-%description -n XFree86-fonts-CP864 -l pl
+%description -n XFree86-fonts-CP864 -l pl.UTF-8
 Pakiet ten zawiera czcionki fixed z kodowaniem CP864.
 
 %package -n XFree86-fonts-CP865
 Summary:	Fixed CP865 fonts
-Summary(pl):	Fonty rastrowe CP865
-Group:		X11/XFree86
-Requires(post,postun):	%{_bindir}/mkfontdir
+Summary(pl.UTF-8):	Fonty rastrowe CP865
+Group:		Fonts
+Requires(post,postun):	fontpostinst
+Requires:	%{_fontsdir}/misc
 
 %description -n XFree86-fonts-CP865
 This package contains fixed fonts with CP865 encoding.
 
-%description -n XFree86-fonts-CP865 -l pl
+%description -n XFree86-fonts-CP865 -l pl.UTF-8
 Pakiet ten zawiera czcionki fixed z kodowaniem CP865.
 
 %package -n XFree86-fonts-CP866
 Summary:	Fixed CP866 fonts
-Summary(pl):	Fonty rastrowe CP866
-Group:		X11/XFree86
-Requires(post,postun):	%{_bindir}/mkfontdir
+Summary(pl.UTF-8):	Fonty rastrowe CP866
+Group:		Fonts
+Requires(post,postun):	fontpostinst
+Requires:	%{_fontsdir}/misc
 
 %description -n XFree86-fonts-CP866
 This package contains fixed fonts with CP866 encoding.
 
-%description -n XFree86-fonts-CP866 -l pl
+%description -n XFree86-fonts-CP866 -l pl.UTF-8
 Pakiet ten zawiera czcionki fixed z kodowaniem CP866.
 
 %package -n XFree86-fonts-CP869
 Summary:	Fixed CP869 fonts
-Summary(pl):	Fonty rastrowe CP869
-Group:		X11/XFree86
-Requires(post,postun):	%{_bindir}/mkfontdir
+Summary(pl.UTF-8):	Fonty rastrowe CP869
+Group:		Fonts
+Requires(post,postun):	fontpostinst
+Requires:	%{_fontsdir}/misc
 
 %description -n XFree86-fonts-CP869
 This package contains fixed fonts with CP869 encoding.
 
-%description -n XFree86-fonts-CP869 -l pl
+%description -n XFree86-fonts-CP869 -l pl.UTF-8
 Pakiet ten zawiera czcionki fixed z kodowaniem CP869.
 
 %package -n XFree86-fonts-CP874
 Summary:	Fixed CP874 fonts
-Summary(pl):	Fonty rastrowe CP874
-Group:		X11/XFree86
-Requires(post,postun):	%{_bindir}/mkfontdir
+Summary(pl.UTF-8):	Fonty rastrowe CP874
+Group:		Fonts
+Requires(post,postun):	fontpostinst
+Requires:	%{_fontsdir}/misc
 
 %description -n XFree86-fonts-CP874
 This package contains fixed fonts with CP874 encoding.
 
-%description -n XFree86-fonts-CP874 -l pl
+%description -n XFree86-fonts-CP874 -l pl.UTF-8
 Pakiet ten zawiera czcionki fixed z kodowaniem CP874.
 
 %package -n XFree86-fonts-Mazovia
 Summary:	Fixed Mazovia fonts
-Summary(pl):	Fonty rastrowe Mazovia
-Group:		X11/XFree86
-Requires(post,postun):	%{_bindir}/mkfontdir
+Summary(pl.UTF-8):	Fonty rastrowe Mazovia
+Group:		Fonts
+Requires(post,postun):	fontpostinst
+Requires:	%{_fontsdir}/misc
 
 %description -n XFree86-fonts-Mazovia
 This package contains fixed fonts with Mazovia encoding.
 
-%description -n XFree86-fonts-Mazovia -l pl
+%description -n XFree86-fonts-Mazovia -l pl.UTF-8
 Pakiet ten zawiera czcionki fixed z kodowaniem Mazovia.
 
 %prep
@@ -223,184 +240,120 @@ for i in *.bdf
 do
 	for j in 737 775 850 852 855 857 860 861 862 863 864 865 866 869 874
 	do
-		ucs2any.pl $i map-CP$j-0 CP$j-0
+		ucs2any $i map-CP$j-0 CP$j-0
 		name=`basename $i .bdf`-CP$j-0
 		bdftopcf -t $name.bdf | gzip -9 > $name.pcf.gz
 		rm -f $name.bdf
 	done
-	ucs2any.pl $i map-Mazovia-0 Mazovia-0
+	ucs2any $i map-Mazovia-0 Mazovia-0
 	name=`basename $i .bdf`-Mazovia-0
 	bdftopcf -t $name.bdf | gzip -9 > $name.pcf.gz
 	rm -f $name.bdf
-done	 
+done
 
 %install
+rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_fontsdir}/misc
 install *.pcf.gz $RPM_BUILD_ROOT%{_fontsdir}/misc
 
+%clean
+rm -rf $RPM_BUILD_ROOT
+
 %post -n XFree86-fonts-CP737
-cd %{_fontsdir}/misc
-umask 022
-%{_bindir}/mkfontdir
+fontpostinst misc
 
 %postun -n XFree86-fonts-CP737
-cd %{_fontsdir}/misc
-umask 022
-%{_bindir}/mkfontdir
+fontpostinst misc
 
 %post -n XFree86-fonts-CP775
-cd %{_fontsdir}/misc
-umask 022
-%{_bindir}/mkfontdir
+fontpostinst misc
 
 %postun -n XFree86-fonts-CP775
-cd %{_fontsdir}/misc
-umask 022
-%{_bindir}/mkfontdir
+fontpostinst misc
 
 %post -n XFree86-fonts-CP850
-cd %{_fontsdir}/misc
-umask 022
-%{_bindir}/mkfontdir
+fontpostinst misc
 
 %postun -n XFree86-fonts-CP850
-cd %{_fontsdir}/misc
-umask 022
-%{_bindir}/mkfontdir
+fontpostinst misc
 
 %post -n XFree86-fonts-CP852
-cd %{_fontsdir}/misc
-umask 022
-%{_bindir}/mkfontdir
+fontpostinst misc
 
 %postun -n XFree86-fonts-CP852
-cd %{_fontsdir}/misc
-umask 022
-%{_bindir}/mkfontdir
+fontpostinst misc
 
 %post -n XFree86-fonts-CP855
-cd %{_fontsdir}/misc
-umask 022
-%{_bindir}/mkfontdir
+fontpostinst misc
 
 %postun -n XFree86-fonts-CP855
-cd %{_fontsdir}/misc
-umask 022
-%{_bindir}/mkfontdir
+fontpostinst misc
 
 %post -n XFree86-fonts-CP857
-cd %{_fontsdir}/misc
-umask 022
-%{_bindir}/mkfontdir
+fontpostinst misc
 
 %postun -n XFree86-fonts-CP857
-cd %{_fontsdir}/misc
-umask 022
-%{_bindir}/mkfontdir
+fontpostinst misc
 
 %post -n XFree86-fonts-CP860
-cd %{_fontsdir}/misc
-umask 022
-%{_bindir}/mkfontdir
+fontpostinst misc
 
 %postun -n XFree86-fonts-CP860
-cd %{_fontsdir}/misc
-umask 022
-%{_bindir}/mkfontdir
+fontpostinst misc
 
 %post -n XFree86-fonts-CP861
-cd %{_fontsdir}/misc
-umask 022
-%{_bindir}/mkfontdir
+fontpostinst misc
 
 %postun -n XFree86-fonts-CP861
-cd %{_fontsdir}/misc
-umask 022
-%{_bindir}/mkfontdir
+fontpostinst misc
 
 %post -n XFree86-fonts-CP862
-cd %{_fontsdir}/misc
-umask 022
-%{_bindir}/mkfontdir
+fontpostinst misc
 
 %postun -n XFree86-fonts-CP862
-cd %{_fontsdir}/misc
-umask 022
-%{_bindir}/mkfontdir
-
+fontpostinst misc
 
 %post -n XFree86-fonts-CP863
-cd %{_fontsdir}/misc
-umask 022
-%{_bindir}/mkfontdir
+fontpostinst misc
 
 %postun -n XFree86-fonts-CP863
-cd %{_fontsdir}/misc
-umask 022
-%{_bindir}/mkfontdir
+fontpostinst misc
 
 %post -n XFree86-fonts-CP864
-cd %{_fontsdir}/misc
-umask 022
-%{_bindir}/mkfontdir
+fontpostinst misc
 
 %postun -n XFree86-fonts-CP864
-cd %{_fontsdir}/misc
-umask 022
-%{_bindir}/mkfontdir
+fontpostinst misc
 
 %post -n XFree86-fonts-CP865
-cd %{_fontsdir}/misc
-umask 022
-%{_bindir}/mkfontdir
+fontpostinst misc
 
 %postun -n XFree86-fonts-CP865
-cd %{_fontsdir}/misc
-umask 022
-%{_bindir}/mkfontdir
+fontpostinst misc
 
 %post -n XFree86-fonts-CP866
-cd %{_fontsdir}/misc
-umask 022
-%{_bindir}/mkfontdir
+fontpostinst misc
 
 %postun -n XFree86-fonts-CP866
-cd %{_fontsdir}/misc
-umask 022
-%{_bindir}/mkfontdir
+fontpostinst misc
 
 %post -n XFree86-fonts-CP869
-cd %{_fontsdir}/misc
-umask 022
-%{_bindir}/mkfontdir
+fontpostinst misc
 
 %postun -n XFree86-fonts-CP869
-cd %{_fontsdir}/misc
-umask 022
-%{_bindir}/mkfontdir
+fontpostinst misc
 
 %post -n XFree86-fonts-CP874
-cd %{_fontsdir}/misc
-umask 022
-%{_bindir}/mkfontdir
+fontpostinst misc
 
 %postun -n XFree86-fonts-CP874
-cd %{_fontsdir}/misc
-umask 022
-%{_bindir}/mkfontdir
+fontpostinst misc
 
 %post -n XFree86-fonts-Mazovia
-cd %{_fontsdir}/misc
-umask 022
-%{_bindir}/mkfontdir
+fontpostinst misc
 
 %postun -n XFree86-fonts-Mazovia
-cd %{_fontsdir}/misc
-umask 022
-%{_bindir}/mkfontdir
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+fontpostinst misc
 
 %files -n XFree86-fonts-CP737
 %defattr(644,root,root,755)