X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=fonts-thai-scalable.spec;h=f0f362d040cc0b71c7333d2de20fd900b53c096d;hb=HEAD;hp=b2d6d78a4b8158727ed28a7e4082f90c58b67997;hpb=a3722173e6d5fbbfcd2585eab5b6d71dce22002c;p=packages%2Ffonts-thai-scalable.git

diff --git a/fonts-thai-scalable.spec b/fonts-thai-scalable.spec
index b2d6d78..f0f362d 100644
--- a/fonts-thai-scalable.spec
+++ b/fonts-thai-scalable.spec
@@ -5,24 +5,28 @@
 Summary:	Collection of Thai scalable fonts
 Summary(pl.UTF-8):	Kolekcja skalowalnych fontów tajskich
 Name:		fonts-thai-scalable
-Version:	0.6.2
-Release:	1
+Version:	0.7.3
+Release:	2
 License:	MIT (Waree font), GPL v2+ (the rest)
 Group:		Fonts
-Source0:	http://linux.thai.net/pub/thailinux/software/thaifonts-scalable/fonts-tlwg-%{version}.tar.xz
-# Source0-md5:	012a319486b1bb18697d2708a3fee09b
-Patch0:		fontconfig-2.10.patch
-URL:		http://linux.thai.net/projects/thaifonts-scalable
+Source0:	https://linux.thai.net/pub/thailinux/software/thaifonts-scalable/fonts-tlwg-%{version}.tar.xz
+# Source0-md5:	d1de007dd0263acb0e64207b77df7f1c
+URL:		https://linux.thai.net/projects/thaifonts-scalable
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake
-BuildRequires:	fontforge >= 20080110
+BuildRequires:	fontforge >= 20190801
+BuildRequires:	python3 >= 1:3.7
+BuildRequires:	python3-fontforge >= 20190801
+BuildRequires:	rpmbuild(macros) >= 1.751
 BuildRequires:	xorg-app-mkfontscale
 %if %{with latex}
+# afm2tfm, vptovf, updmap-sys, mktexlsr
 BuildRequires:	texlive
 BuildRequires:	thailatex >= 0.4.6
 %endif
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	xz
+BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -129,7 +133,6 @@ Ten pakiet zawiera fonty LaTeXowe do używania z pakietem thailatex.
 
 %prep
 %setup -q -n fonts-tlwg-%{version}
-%patch0 -p1
 
 %build
 %{__aclocal}
@@ -137,8 +140,9 @@ Ten pakiet zawiera fonty LaTeXowe do używania z pakietem thailatex.
 %{__automake}
 %configure \
 	%{?with_latex:--enable-latex} \
-	--enable-pfb \
 	--enable-otf \
+	--enable-pfb \
+	--enable-ttf \
 	--with-otfdir=%{_fontsdir}/OTF \
 	--with-ttfdir=%{_fontsdir}/TTF \
 	--with-type1dir=%{_fontsdir}/Type1
@@ -151,7 +155,7 @@ rm -rf $RPM_BUILD_ROOT
 	DESTDIR=$RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT%{_fontsdir}/Type1/afm
-mv $RPM_BUILD_ROOT%{_fontsdir}/Type1/*.afm $RPM_BUILD_ROOT%{_fontsdir}/Type1/afm
+%{__mv} $RPM_BUILD_ROOT%{_fontsdir}/Type1/*.afm $RPM_BUILD_ROOT%{_fontsdir}/Type1/afm
 mkfontscale -o $RPM_BUILD_ROOT%{_fontsdir}/Type1/fonts.scale.thai-scalable $RPM_BUILD_ROOT%{_fontsdir}/Type1
 
 %clean
@@ -176,16 +180,14 @@ fontpostinst Type1
 fontpostinst Type1
 
 %post	-n thailatex-fonts
-umask 022
-%{_bindir}/texhash
+%texhash
 
 %postun	-n thailatex-fonts
-umask 022
-%{_bindir}/texhash
+%texhash
 
 %files -n fonts-OTF-thai
 %defattr(644,root,root,755)
-%doc AUTHORS COPYING ChangeLog NEWS README TODO
+%doc AUTHORS COPYING ChangeLog NEWS README
 %{_fontsdir}/OTF/Garuda*.otf
 %{_fontsdir}/OTF/Kinnari*.otf
 %{_fontsdir}/OTF/Laksaman*.otf
@@ -199,7 +201,7 @@ umask 022
 
 %files -n fonts-TTF-thai
 %defattr(644,root,root,755)
-%doc AUTHORS COPYING ChangeLog ChangeLog.thai-ttf NEWS README TODO
+%doc AUTHORS COPYING ChangeLog ChangeLog.thai-ttf NEWS README
 %{_fontsdir}/TTF/Garuda*.ttf
 %{_fontsdir}/TTF/Kinnari*.ttf
 %{_fontsdir}/TTF/Laksaman*.ttf
@@ -216,7 +218,7 @@ umask 022
 
 %files -n fonts-Type1-thai
 %defattr(644,root,root,755)
-%doc AUTHORS COPYING ChangeLog NEWS README TODO
+%doc AUTHORS COPYING ChangeLog NEWS README
 %{_fontsdir}/Type1/Garuda*.pfb
 %{_fontsdir}/Type1/Kinnari*.pfb
 %{_fontsdir}/Type1/Laksaman*.pfb
@@ -241,10 +243,11 @@ umask 022
 
 %files -n thailatex-fonts
 %defattr(644,root,root,755)
-%doc AUTHORS COPYING ChangeLog NEWS README TODO
+%doc AUTHORS COPYING ChangeLog NEWS README
 %{_datadir}/texmf/fonts/afm/public/fonts-tlwg
 %{_datadir}/texmf/fonts/enc/dvips/fonts-tlwg
 %{_datadir}/texmf/fonts/map/dvips/fonts-tlwg
+%{_datadir}/texmf/fonts/opentype/public/fonts-tlwg
 %{_datadir}/texmf/fonts/tfm/public/fonts-tlwg
 %{_datadir}/texmf/fonts/type1/public/fonts-tlwg
 %{_datadir}/texmf/fonts/vf/public/fonts-tlwg