Fix FTBFS for F33+ (rhbz#1871278)
Signed-off-by: Parag Nemade <pnemade@fedoraproject.org>
This commit is contained in:
parent
689d65a1be
commit
b475f5b4c2
@ -13,7 +13,7 @@ Version: 2.37
|
|||||||
|
|
||||||
%global source_name dejavu-fonts
|
%global source_name dejavu-fonts
|
||||||
|
|
||||||
Release: 14%{?dist}
|
Release: 15%{?dist}
|
||||||
# original bitstream glyphs are Bitstream Vera
|
# original bitstream glyphs are Bitstream Vera
|
||||||
# glyphs modifications by dejavu project are Public Domain
|
# glyphs modifications by dejavu project are Public Domain
|
||||||
# glyphs imported from Arev fonts are under BitStream Vera compatible license
|
# glyphs imported from Arev fonts are under BitStream Vera compatible license
|
||||||
@ -120,9 +120,6 @@ Suggests: font(dejavusansmono)
|
|||||||
This package consists of the DejaVu sans-serif mono-space font faces, with
|
This package consists of the DejaVu sans-serif mono-space font faces, with
|
||||||
Unicode coverage restricted to Latin, Greek and Cyrillic.}
|
Unicode coverage restricted to Latin, Greek and Cyrillic.}
|
||||||
|
|
||||||
%fontmeta
|
|
||||||
|
|
||||||
%global source_files %{expand:
|
|
||||||
Source0: %{forgesource}
|
Source0: %{forgesource}
|
||||||
Source11: 57-%{fontpkgname1}.xml
|
Source11: 57-%{fontpkgname1}.xml
|
||||||
Source12: 57-%{fontpkgname2}.xml
|
Source12: 57-%{fontpkgname2}.xml
|
||||||
@ -131,14 +128,13 @@ Source14: 58-%{fontpkgname4}.xml
|
|||||||
Source15: 58-%{fontpkgname5}.xml
|
Source15: 58-%{fontpkgname5}.xml
|
||||||
Source16: 58-%{fontpkgname6}.xml
|
Source16: 58-%{fontpkgname6}.xml
|
||||||
Patch0: %{source_name}-urn-dtd.patch
|
Patch0: %{source_name}-urn-dtd.patch
|
||||||
}
|
|
||||||
|
|
||||||
%new_package
|
Name: dejavu-fonts
|
||||||
Summary: The DejaVu font families
|
Summary: The DejaVu font families
|
||||||
%description
|
%description
|
||||||
%wordwrap -v common_description
|
%wordwrap -v common_description
|
||||||
|
|
||||||
%fontpkg
|
%fontpkg -a
|
||||||
|
|
||||||
%fontmetapkg -z 1,2,3
|
%fontmetapkg -z 1,2,3
|
||||||
|
|
||||||
@ -151,7 +147,7 @@ Cyrillic.
|
|||||||
|
|
||||||
%fontmetapkg -n dejavu-lgc-fonts-all -s lgcmetasummary -d lgcmetadescription -z 4,5,6
|
%fontmetapkg -n dejavu-lgc-fonts-all -s lgcmetasummary -d lgcmetadescription -z 4,5,6
|
||||||
|
|
||||||
%new_package doc
|
%package doc
|
||||||
Summary: Optional documentation files of %{source_name}
|
Summary: Optional documentation files of %{source_name}
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
%description doc
|
%description doc
|
||||||
@ -168,16 +164,16 @@ make %{?_smp_mflags} VERSION=%{version} FC-LANG="" \
|
|||||||
UNICODEDATA=/usr/share/unicode/ucd/UnicodeData.txt \
|
UNICODEDATA=/usr/share/unicode/ucd/UnicodeData.txt \
|
||||||
BUILDDIR=.
|
BUILDDIR=.
|
||||||
xz -9 *.txt
|
xz -9 *.txt
|
||||||
%fontbuild
|
%fontbuild -a
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%fontinstall
|
%fontinstall -a
|
||||||
|
|
||||||
%check
|
%check
|
||||||
make check
|
make check
|
||||||
%fontcheck
|
%fontcheck -a
|
||||||
|
|
||||||
%fontfiles
|
%fontfiles -a
|
||||||
|
|
||||||
%files doc
|
%files doc
|
||||||
%defattr(644, root, root, 0755)
|
%defattr(644, root, root, 0755)
|
||||||
@ -185,6 +181,10 @@ make check
|
|||||||
%doc *.txt.xz
|
%doc *.txt.xz
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Sep 04 2020 Parag Nemade <pnemade AT redhat DOT com>
|
||||||
|
- 2.37-15
|
||||||
|
- Fix this spec file to build for F33+
|
||||||
|
|
||||||
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org>
|
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org>
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user