diff --git a/25-no-bitmap-fedora.conf b/25-no-bitmap-fedora.conf
deleted file mode 100644
index ffa7926..0000000
--- a/25-no-bitmap-fedora.conf
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
-
-
- Kochi Mincho
-
-
- false
-
-
-
-
- Kochi Gothic
-
-
- false
-
-
-
-
- Sazanami Mincho
-
-
- false
-
-
-
-
- Sazanami Gothic
-
-
- false
-
-
-
-
- AR PL ShanHeiSun Uni
-
-
- true
-
-
-
diff --git a/25-no-bitmap.conf b/25-no-bitmap.conf
deleted file mode 100644
index ffa7926..0000000
--- a/25-no-bitmap.conf
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
-
-
- Kochi Mincho
-
-
- false
-
-
-
-
- Kochi Gothic
-
-
- false
-
-
-
-
- Sazanami Mincho
-
-
- false
-
-
-
-
- Sazanami Gothic
-
-
- false
-
-
-
-
- AR PL ShanHeiSun Uni
-
-
- true
-
-
-
diff --git a/fontconfig.spec b/fontconfig.spec
index acdece9..ed1b548 100644
--- a/fontconfig.spec
+++ b/fontconfig.spec
@@ -2,13 +2,12 @@
Name: fontconfig
Version: 2.13.1
-Release: 3
+Release: 4
Summary: Fontconfig is a library for configuring and customizing font access
License: MIT and Public Domain and UCD
URL: http://fontconfig.org
Source0: http://fontconfig.org/release/%{name}-%{version}.tar.bz2
-Source1: 25-no-bitmap-fedora.conf
-Source2: fc-cache
+Source1: fc-cache
BuildRequires: expat-devel freetype-devel >= %{freetype_version} fontpackages-devel libuuid-devel
BuildRequires: autoconf automake libtool gettext itstool gperf
@@ -54,7 +53,6 @@ autoreconf
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}/
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}
-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}-conf
@@ -117,6 +115,12 @@ HOME=/root /usr/bin/fc-cache -s
%{_mandir}/man3/*
%changelog
+* Fri Apr 10 2020 openEuler Buildteam - 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 - 2.13.1-3
- Type:enhancement
- ID:NA