From 4a2ebd0c9fdf4c06cc24adeb37e1311e8a872940ba1785657bf3ec3aca6b8d6f Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Sat, 1 Mar 2014 14:42:16 +0000 Subject: [PATCH] - add fix-fontconfig.patch not to take installation specific fontconfig any longer OBS-URL: https://build.opensuse.org/package/show/system:install:head/installation-images?expand=0&rev=624 --- fix-fontconfig.patch | 22 ++++++++++++++++++++++ installation-images-SLES.spec | 2 ++ installation-images-openSUSE.changes | 6 ++++++ installation-images-openSUSE.spec | 2 ++ 4 files changed, 32 insertions(+) create mode 100644 fix-fontconfig.patch diff --git a/fix-fontconfig.patch b/fix-fontconfig.patch new file mode 100644 index 0000000..63b66c9 --- /dev/null +++ b/fix-fontconfig.patch @@ -0,0 +1,22 @@ +commit 2195e67b43a12d32398f8a5b395c38b5dff4889d +Author: Stephan Kulow +Date: Sat Mar 1 15:33:52 2014 +0100 + + take all of fontconfig - see sr#224058 + +diff --git a/data/root/root.file_list b/data/root/root.file_list +index f67ed84..c7435bd 100644 +--- a/data/root/root.file_list ++++ b/data/root/root.file_list +@@ -456,11 +456,6 @@ xterm: + gpm: + /usr/sbin/gpm + +-fontconfig: +- / +- r /etc/fonts/local.conf +- m /etc/fonts/local.conf.instsys /etc/fonts/local.conf +- + xdm: + /etc/X11/xdm/Keyboard.map + diff --git a/installation-images-SLES.spec b/installation-images-SLES.spec index 753cf9e..260bf20 100644 --- a/installation-images-SLES.spec +++ b/installation-images-SLES.spec @@ -355,6 +355,7 @@ Version: 14.50 Release: 0 Provides: installation-images = %version-%release Source: installation-images-14.50.tar.bz2 +Patch0: fix-fontconfig.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define _binary_payload w.ufdio @@ -390,6 +391,7 @@ Package that holds debuginfo dependencies for image files in installation-image. %prep %setup -n installation-images-%{version} +%patch0 -p1 rm -f /usr/lib/build/checks/04-check-filelist %build diff --git a/installation-images-openSUSE.changes b/installation-images-openSUSE.changes index b3e49da..38fa75d 100644 --- a/installation-images-openSUSE.changes +++ b/installation-images-openSUSE.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Mar 1 14:41:20 UTC 2014 - coolo@suse.com + +- add fix-fontconfig.patch not to take installation specific fontconfig + any longer + ------------------------------------------------------------------- Fri Feb 28 14:10:48 CET 2014 - snwint@suse.de diff --git a/installation-images-openSUSE.spec b/installation-images-openSUSE.spec index 4a1979d..57272f1 100644 --- a/installation-images-openSUSE.spec +++ b/installation-images-openSUSE.spec @@ -355,6 +355,7 @@ Version: 14.50 Release: 0 Provides: installation-images = %version-%release Source: installation-images-14.50.tar.bz2 +Patch0: fix-fontconfig.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define _binary_payload w.ufdio @@ -390,6 +391,7 @@ Package that holds debuginfo dependencies for image files in installation-image. %prep %setup -n installation-images-%{version} +%patch0 -p1 rm -f /usr/lib/build/checks/04-check-filelist %build