From 57609aa1db1f951e93d7a76730a6fcbb8978270a Mon Sep 17 00:00:00 2001
From: Akira TAGOH <akira@tagoh.org>
Date: Mon, 30 Nov 2020 17:58:12 +0900
Subject: [PATCH] Fix file conflicts.

---
 fontconfig.spec | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/fontconfig.spec b/fontconfig.spec
index cb4d4ae..ed4128e 100644
--- a/fontconfig.spec
+++ b/fontconfig.spec
@@ -5,7 +5,7 @@
 Summary:	Font configuration and customization library
 Name:		fontconfig
 Version:	2.13.93
-Release:	1%{?dist}
+Release:	2%{?dist}
 # src/ftglue.[ch] is in Public Domain
 # src/fccache.c contains Public Domain code
 # fc-case/CaseFolding.txt is in the UCD
@@ -70,6 +70,12 @@ which is useful for developing applications that uses fontconfig.
 %autosetup -p1
 
 %build
+# We don't want to rebuild the docs, but we want to install the included ones.
+export HASDOCBOOK=no
+
+for i in doc/*.fncs; do
+  touch -r $i ${i//.fncs/.sgml}
+done
 autoreconf
 %configure	--with-add-fonts=/usr/share/X11/fonts/Type1,/usr/share/X11/fonts/TTF,/usr/local/share/fonts \
 		--enable-libxml2 \
@@ -90,6 +96,10 @@ ln -s %{_fontconfig_templatedir}/25-unhint-nonlatin.conf $RPM_BUILD_ROOT%{_fontc
 mv $RPM_BUILD_ROOT%{_docdir}/fontconfig/* .
 rmdir $RPM_BUILD_ROOT%{_docdir}/fontconfig/
 
+# adjust the timestamp to avoid conflicts for multilib
+touch -r doc/fontconfig-user.sgml fontconfig-user.txt
+touch -r doc/fontconfig-user.sgml fontconfig-user.html
+
 # rename fc-cache binary
 mv $RPM_BUILD_ROOT%{_bindir}/fc-cache $RPM_BUILD_ROOT%{_bindir}/fc-cache-%{__isa_bits}
 
@@ -176,6 +186,9 @@ fi
 %doc fontconfig-devel.txt fontconfig-devel
 
 %changelog
+* Mon Nov 30 2020 Akira TAGOH <tagoh@redhat.com> - 2.13.93-2
+- Fix file conflicts.
+
 * Sat Nov 28 2020 Akira TAGOH <tagoh@redhat.com> - 2.13.93-1
 - New upstream release.