From 06a283188579164ee5742e6db2507b71aaaea619 Mon Sep 17 00:00:00 2001 From: Paul Flo Williams Date: Tue, 29 Nov 2011 19:01:42 +0000 Subject: [PATCH] Depend on unicode-ucd instead of Perl --- dejavu-fonts.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dejavu-fonts.spec b/dejavu-fonts.spec index 1c77f19..3b720ba 100644 --- a/dejavu-fonts.spec +++ b/dejavu-fonts.spec @@ -7,10 +7,6 @@ #global archiveversion 2.24-20080512-2226 %global archiveversion %{version} -# Let the perl maintainer worry about Unicode.org data files -%global Blocks %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/Blocks.txt -%global UnicodeData %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/UnicodeData.txt - # Common description %global common_desc \ The DejaVu font set is based on the “Bitstream Vera” fonts, release 1.10. Its\ @@ -20,7 +16,7 @@ original style, using an open collaborative development process. Name: %{fontname}-fonts Version: 2.33 -Release: 1%{?alphatag}%{?dist} +Release: 2%{?alphatag}%{?dist} Summary: DejaVu fonts Group: User Interface/X @@ -33,7 +29,7 @@ Source0: %{?!alphatag:http://downloads.sourceforge.net/%{fontname}}%{?alphatag BuildRequires: fontforge >= 20080429 BuildRequires: perl(Font::TTF) # Needed to compute unicode coverage -BuildRequires: %{Blocks} %{UnicodeData} +BuildRequires: unicode-ucd BuildArch: noarch BuildRequires: fontpackages-devel @@ -166,7 +162,7 @@ unicode coverage restricted to Latin, Greek and Cyrillic. %build make %{?_smp_mflags} VERSION=%{version} FC-LANG="" \ - BLOCKS=%{Blocks} UNICODEDATA=%{UnicodeData} + BLOCKS=/usr/share/unicode/ucd/Blocks.txt UNICODEDATA=/usr/share/unicode/ucd/UnicodeData.txt # Stop the desktop people from complaining this file is too big bzip2 -9 build/status.txt @@ -204,6 +200,10 @@ rm -fr %{buildroot} %changelog +* Tue Nov 29 2011 Paul Flo Williams +- 2.33-2 +- Get Unicode data from unicode-ucd. Fixes FTBFS bug #748522 + * Mon Apr 04 2011 Nicolas Mailhot - 2.33-1 — Improved Hebrew and Armenian