From d8bff6cf942007b97811f9281482f39102e059b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Wed, 6 Dec 2017 12:27:23 +0000
Subject: [PATCH] keep the fc_local.conf for System->OpenSymbol mapping

---
 ...ed-tdf-105998-except-cut-and-paste-as-bitmap-in.patch | 9 ---------
 libreoffice.spec                                         | 5 ++++-
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/0001-Related-tdf-105998-except-cut-and-paste-as-bitmap-in.patch b/0001-Related-tdf-105998-except-cut-and-paste-as-bitmap-in.patch
index 1c7e76e..1d09956 100644
--- a/0001-Related-tdf-105998-except-cut-and-paste-as-bitmap-in.patch
+++ b/0001-Related-tdf-105998-except-cut-and-paste-as-bitmap-in.patch
@@ -33,15 +33,6 @@ index 9c21c83ee..5c5c0bb 100644
  #include <vcl/hatch.hxx>
  #include <tools/diagnose_ex.h>
  #include <com/sun/star/awt/PosSize.hpp>
-@@ -139,7 +140,7 @@ namespace drawinglayer
-             }
- 
-             //Resolves: tdf#105998 if we are a hairline along the very right/bottom edge
--            //of the canvas then destroy the polygon inwards one pixel right/bottom so that
-+            //of the canvas then distort the polygon inwards one pixel right/bottom so that
-             //the hairline falls inside the paintable area and becomes visible
-             Size aSize = mpOutputDevice->GetOutputSize();
-             basegfx::B2DRange aRange = aLocalPolygon.getB2DRange();
 @@ -210,10 +211,6 @@ namespace drawinglayer
                  maBColorModifierStack.getModifiedColor(
                      rSource.getLineAttribute().getColor()));
diff --git a/libreoffice.spec b/libreoffice.spec
index d0371a2..d3cb79e 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -1284,7 +1284,7 @@ pushd %{buildroot}%{baseinstdir}/share/fonts/truetype
 install -d -m 0755 %{buildroot}%{_fontdir}
 install -p -m 0644 *.ttf %{buildroot}%{_fontdir}
 popd
-rm -rf %{buildroot}%{baseinstdir}/share/fonts
+rm -rf %{buildroot}%{baseinstdir}/share/fonts/truetype/*.ttf
 
 # move platform-independent data into shared dir
 install -m 0755 -d %{buildroot}%{datadir}
@@ -1725,6 +1725,9 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar
 %{baseinstdir}/program/versionrc
 %{baseinstdir}/program/xid-fullscreen-on-all-monitors
 %dir %{baseinstdir}/share
+%dir %{baseinstdir}/share/fonts
+%dir %{baseinstdir}/share/fonts/truetype
+%{baseinstdir}/share/fonts/truetype/fc_local.conf
 %dir %{baseinstdir}/share/Scripts
 %{baseinstdir}/share/Scripts/java
 %dir %{baseinstdir}/share/autotext