From 9f5510bb7013a336d10784c0d775be4b01ecc360b36a383587993bb467567fde Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Wed, 25 Jul 2012 07:15:32 +0000 Subject: [PATCH 1/2] Accepting request 128898 from home:tiwai:branches:M17N - Fill some contents in the initial suse-bitmap.conf and suse-hinting-bc.conf (bnc#772664) OBS-URL: https://build.opensuse.org/request/show/128898 OBS-URL: https://build.opensuse.org/package/show/M17N/fonts-config?expand=0&rev=22 --- fonts-config.changes | 6 ++++++ fonts-config.spec | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/fonts-config.changes b/fonts-config.changes index 81d9b28..a044fbc 100644 --- a/fonts-config.changes +++ b/fonts-config.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jul 25 08:26:30 CEST 2012 - tiwai@suse.de + +- Fill some contents in the initial suse-bitmap.conf and + suse-hinting-bc.conf (bnc#772664) + ------------------------------------------------------------------- Wed Jun 13 11:25:43 CEST 2012 - tiwai@suse.de diff --git a/fonts-config.spec b/fonts-config.spec index af09d99..5bb945a 100644 --- a/fonts-config.spec +++ b/fonts-config.spec @@ -66,8 +66,10 @@ install -m 644 $RPM_SOURCE_DIR/sysconfig.fonts-config \ # mkdir -p $RPM_BUILD_ROOT/etc/fonts/conf.d mkdir -p $RPM_BUILD_ROOT/etc/fonts/conf.avail -touch $RPM_BUILD_ROOT/etc/fonts/conf.avail/12-suse-hinting-bc.conf -touch $RPM_BUILD_ROOT/etc/fonts/conf.avail/17-suse-bitmaps.conf +sed -e's/_BYTECODE_BW_MAX_PIXEL_/0/' %{S:6} \ + > $RPM_BUILD_ROOT/etc/fonts/conf.avail/12-suse-hinting-bc.conf +sed -e's/_USE_EMBEDDED_BITMAPS_PLACEHOLDER_//' %{S:7} \ + > $RPM_BUILD_ROOT/etc/fonts/conf.avail/17-suse-bitmaps.conf ln -s ../conf.avail/12-suse-hinting-bc.conf \ $RPM_BUILD_ROOT/etc/fonts/conf.d/12-suse-hinting-bc.conf ln -s ../conf.avail/17-suse-bitmaps.conf \ From f43b84bdbb33c6e8d6f5dd147f2ddaa7143f087c9d2aefae08b74ed5d527353a Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Thu, 26 Jul 2012 08:44:07 +0000 Subject: [PATCH 2/2] - add Requires(pre): %suseconfig_fonts_prereq [bnc#772644] OBS-URL: https://build.opensuse.org/package/show/M17N/fonts-config?expand=0&rev=23 --- fonts-config.changes | 5 +++++ fonts-config.spec | 1 + 2 files changed, 6 insertions(+) diff --git a/fonts-config.changes b/fonts-config.changes index a044fbc..f0f84db 100644 --- a/fonts-config.changes +++ b/fonts-config.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jul 26 08:24:43 UTC 2012 - pgajdos@suse.com + +- add Requires(pre): %suseconfig_fonts_prereq [bnc#772644] + ------------------------------------------------------------------- Wed Jul 25 08:26:30 CEST 2012 - tiwai@suse.de diff --git a/fonts-config.spec b/fonts-config.spec index 5bb945a..b981f40 100644 --- a/fonts-config.spec +++ b/fonts-config.spec @@ -20,6 +20,7 @@ Name: fonts-config Provides: xf86tools:/usr/sbin/fonts-config Requires: fontconfig >= 2.3.93.20060103 Requires: perl(English) +Requires(pre): %suseconfig_fonts_prereq Recommends: ft2demos PreReq: %fillup_prereq Version: 20080121