From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Thu, 2 Mar 2023 20:54:43 +0000 (+0100)
Subject: - updated to 1.0.5
X-Git-Tag: auto/th/xorg-font-font-screen-cyrillic-1.0.5-1
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=3cb779474a44ae3e68fe288a188562552c767c75;p=packages%2Fxorg-font-font-screen-cyrillic.git

- updated to 1.0.5
---

diff --git a/xorg-font-font-screen-cyrillic.spec b/xorg-font-font-screen-cyrillic.spec
index aeb4e85..0324e6b 100644
--- a/xorg-font-font-screen-cyrillic.spec
+++ b/xorg-font-font-screen-cyrillic.spec
@@ -1,20 +1,22 @@
 Summary:	Screen Fixed Cyrillic font
 Summary(pl.UTF-8):	Font Screen Fixed w cyrylicy
 Name:		xorg-font-font-screen-cyrillic
-Version:	1.0.4
-Release:	2
+Version:	1.0.5
+Release:	1
 License:	MIT
 Group:		Fonts
-Source0:	http://xorg.freedesktop.org/releases/individual/font/font-screen-cyrillic-%{version}.tar.bz2
-# Source0-md5:	6f3fdcf2454bf08128a651914b7948ca
-URL:		http://xorg.freedesktop.org/
-BuildRequires:	autoconf >= 2.57
+Source0:	https://xorg.freedesktop.org/releases/individual/font/font-screen-cyrillic-%{version}.tar.xz
+# Source0-md5:	9e0f38698bf999376f3be3674e8cfd86
+URL:		https://xorg.freedesktop.org/
+BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake
+BuildRequires:	tar >= 1:1.22
 BuildRequires:	xorg-app-bdftopcf
 BuildRequires:	xorg-app-mkfontdir
 BuildRequires:	xorg-app-mkfontscale
-BuildRequires:	xorg-font-font-util >= 1.2
-BuildRequires:	xorg-util-util-macros >= 1.3
+BuildRequires:	xorg-font-font-util >= 1.4
+BuildRequires:	xorg-util-util-macros >= 1.20
+BuildRequires:	xz
 Requires(post,postun):	fontpostinst
 Requires:	%{_fontsdir}/cyrillic
 # contains useful aliases for these fonts
@@ -36,8 +38,10 @@ Font Screen Fixed w cyrylicy.
 %{__autoconf}
 %{__automake}
 %configure \
+%if "%{_gnu}" != "-gnux32"
 	--build=%{_host} \
 	--host=%{_host} \
+%endif
 	--with-fontdir=%{_fontsdir}/cyrillic
 
 %{__make}
@@ -48,8 +52,8 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-# fonts.scale bogus, fonts.dir generated in post
-rm -f $RPM_BUILD_ROOT%{_fontsdir}/cyrillic/fonts.{dir,scale}
+# fonts.dir generated in post
+%{__rm} $RPM_BUILD_ROOT%{_fontsdir}/cyrillic/fonts.dir
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -62,5 +66,5 @@ fontpostinst cyrillic
 
 %files
 %defattr(644,root,root,755)
-%doc COPYING ChangeLog README
+%doc COPYING ChangeLog README.md
 %{_fontsdir}/cyrillic/screen*.pcf.gz