!2 fonconfig：remove 25-no-bitmap-fedora.conf and 25-no-bitmap.conf
Merge pull request !2 from w00284301/master
This commit is contained in:
openeuler-ci-bot
Gitee
commit
4c87c72a5b
@ -1,44 +0,0 @@
|
|||||||
<?xml version="1.0"?>
|
|
||||||
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
|
|
||||||
<fontconfig>
|
|
||||||
<match target="font">
|
|
||||||
<test name="family" compare="eq">
|
|
||||||
<string>Kochi Mincho</string>
|
|
||||||
</test>
|
|
||||||
<edit name="embeddedbitmap" mode="assign">
|
|
||||||
<bool>false</bool>
|
|
||||||
</edit>
|
|
||||||
</match>
|
|
||||||
<match target="font">
|
|
||||||
<test name="family" compare="eq">
|
|
||||||
<string>Kochi Gothic</string>
|
|
||||||
</test>
|
|
||||||
<edit name="embeddedbitmap" mode="assign">
|
|
||||||
<bool>false</bool>
|
|
||||||
</edit>
|
|
||||||
</match>
|
|
||||||
<match target="font">
|
|
||||||
<test name="family" compare="eq">
|
|
||||||
<string>Sazanami Mincho</string>
|
|
||||||
</test>
|
|
||||||
<edit name="embeddedbitmap" mode="assign">
|
|
||||||
<bool>false</bool>
|
|
||||||
</edit>
|
|
||||||
</match>
|
|
||||||
<match target="font">
|
|
||||||
<test name="family" compare="eq">
|
|
||||||
<string>Sazanami Gothic</string>
|
|
||||||
</test>
|
|
||||||
<edit name="embeddedbitmap" mode="assign">
|
|
||||||
<bool>false</bool>
|
|
||||||
</edit>
|
|
||||||
</match>
|
|
||||||
<match target="font">
|
|
||||||
<test name="family" compare="eq">
|
|
||||||
<string>AR PL ShanHeiSun Uni</string>
|
|
||||||
</test>
|
|
||||||
<edit name="embeddedbitmap" mode="assign">
|
|
||||||
<bool>true</bool>
|
|
||||||
</edit>
|
|
||||||
</match>
|
|
||||||
</fontconfig>
|
|
||||||
@ -1,44 +0,0 @@
|
|||||||
<?xml version="1.0"?>
|
|
||||||
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
|
|
||||||
<fontconfig>
|
|
||||||
<match target="font">
|
|
||||||
<test name="family" compare="eq">
|
|
||||||
<string>Kochi Mincho</string>
|
|
||||||
</test>
|
|
||||||
<edit name="embeddedbitmap" mode="assign">
|
|
||||||
<bool>false</bool>
|
|
||||||
</edit>
|
|
||||||
</match>
|
|
||||||
<match target="font">
|
|
||||||
<test name="family" compare="eq">
|
|
||||||
<string>Kochi Gothic</string>
|
|
||||||
</test>
|
|
||||||
<edit name="embeddedbitmap" mode="assign">
|
|
||||||
<bool>false</bool>
|
|
||||||
</edit>
|
|
||||||
</match>
|
|
||||||
<match target="font">
|
|
||||||
<test name="family" compare="eq">
|
|
||||||
<string>Sazanami Mincho</string>
|
|
||||||
</test>
|
|
||||||
<edit name="embeddedbitmap" mode="assign">
|
|
||||||
<bool>false</bool>
|
|
||||||
</edit>
|
|
||||||
</match>
|
|
||||||
<match target="font">
|
|
||||||
<test name="family" compare="eq">
|
|
||||||
<string>Sazanami Gothic</string>
|
|
||||||
</test>
|
|
||||||
<edit name="embeddedbitmap" mode="assign">
|
|
||||||
<bool>false</bool>
|
|
||||||
</edit>
|
|
||||||
</match>
|
|
||||||
<match target="font">
|
|
||||||
<test name="family" compare="eq">
|
|
||||||
<string>AR PL ShanHeiSun Uni</string>
|
|
||||||
</test>
|
|
||||||
<edit name="embeddedbitmap" mode="assign">
|
|
||||||
<bool>true</bool>
|
|
||||||
</edit>
|
|
||||||
</match>
|
|
||||||
</fontconfig>
|
|
||||||
@ -2,13 +2,12 @@
|
|||||||
|
|
||||||
Name: fontconfig
|
Name: fontconfig
|
||||||
Version: 2.13.1
|
Version: 2.13.1
|
||||||
Release: 3
|
Release: 4
|
||||||
Summary: Fontconfig is a library for configuring and customizing font access
|
Summary: Fontconfig is a library for configuring and customizing font access
|
||||||
License: MIT and Public Domain and UCD
|
License: MIT and Public Domain and UCD
|
||||||
URL: http://fontconfig.org
|
URL: http://fontconfig.org
|
||||||
Source0: http://fontconfig.org/release/%{name}-%{version}.tar.bz2
|
Source0: http://fontconfig.org/release/%{name}-%{version}.tar.bz2
|
||||||
Source1: 25-no-bitmap-fedora.conf
|
Source1: fc-cache
|
||||||
Source2: fc-cache
|
|
||||||
|
|
||||||
BuildRequires: expat-devel freetype-devel >= %{freetype_version} fontpackages-devel libuuid-devel
|
BuildRequires: expat-devel freetype-devel >= %{freetype_version} fontpackages-devel libuuid-devel
|
||||||
BuildRequires: autoconf automake libtool gettext itstool gperf
|
BuildRequires: autoconf automake libtool gettext itstool gperf
|
||||||
@ -54,7 +53,6 @@ autoreconf
|
|||||||
|
|
||||||
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
|
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
|
||||||
|
|
||||||
install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
|
|
||||||
ln -s %{_fontconfig_templatedir}/25-unhint-nonlatin.conf $RPM_BUILD_ROOT%{_fontconfig_confdir}/
|
ln -s %{_fontconfig_templatedir}/25-unhint-nonlatin.conf $RPM_BUILD_ROOT%{_fontconfig_confdir}/
|
||||||
|
|
||||||
mv $RPM_BUILD_ROOT%{_docdir}/fontconfig/* .
|
mv $RPM_BUILD_ROOT%{_docdir}/fontconfig/* .
|
||||||
@ -62,7 +60,7 @@ rmdir $RPM_BUILD_ROOT%{_docdir}/fontconfig/
|
|||||||
|
|
||||||
mv $RPM_BUILD_ROOT%{_bindir}/fc-cache $RPM_BUILD_ROOT%{_bindir}/fc-cache-%{__isa_bits}
|
mv $RPM_BUILD_ROOT%{_bindir}/fc-cache $RPM_BUILD_ROOT%{_bindir}/fc-cache-%{__isa_bits}
|
||||||
|
|
||||||
install -p -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/fc-cache
|
install -p -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/fc-cache
|
||||||
|
|
||||||
%find_lang %{name}
|
%find_lang %{name}
|
||||||
%find_lang %{name}-conf
|
%find_lang %{name}-conf
|
||||||
@ -117,6 +115,12 @@ HOME=/root /usr/bin/fc-cache -s
|
|||||||
%{_mandir}/man3/*
|
%{_mandir}/man3/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Apr 10 2020 openEuler Buildteam <buildteam@openeuler.org> - 2.13.1-4
|
||||||
|
- Type:bugfix
|
||||||
|
- ID:NA
|
||||||
|
- SUG:NA
|
||||||
|
- DESC:remove 25-no-bitmap-fedora.conf and 25-no-bitmap.conf
|
||||||
|
|
||||||
* Thu Jan 9 2020 openEuler Buildteam <buildteam@openeuler.org> - 2.13.1-3
|
* Thu Jan 9 2020 openEuler Buildteam <buildteam@openeuler.org> - 2.13.1-3
|
||||||
- Type:enhancement
|
- Type:enhancement
|
||||||
- ID:NA
|
- ID:NA
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user