From 88c4f2de946fb673fbaa5118cc4d70f80cee42eb9daed34f912523caf8540c66 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Mon, 14 Oct 2013 06:07:10 +0000 Subject: [PATCH 1/2] - minor fix in %reconfigure_fonts_post macro (really check for cjk *-config before run them) OBS-URL: https://build.opensuse.org/package/show/M17N:fonts/fontpackages?expand=0&rev=20 --- fontpackages.changes | 6 ++++++ rpm-macros.fonts-config | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/fontpackages.changes b/fontpackages.changes index f0a3a3a..bf359cf 100644 --- a/fontpackages.changes +++ b/fontpackages.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Oct 14 06:05:19 UTC 2013 - pgajdos@suse.com + +- minor fix in %reconfigure_fonts_post macro (really check for + cjk *-config before run them) + ------------------------------------------------------------------- Mon Sep 30 08:44:46 UTC 2013 - pgajdos@suse.com diff --git a/rpm-macros.fonts-config b/rpm-macros.fonts-config index e0338a9..677fbd7 100644 --- a/rpm-macros.fonts-config +++ b/rpm-macros.fonts-config @@ -115,10 +115,10 @@ Requires(pre): perl aaa_base \ echo 'rm %{__fontsupdatescript}' >> %{__fontsupdatescript} \ %{-c: \ echo 'if [ -e %{__fontsconfigrunflag}-cjk ]; then' > %{__fontsupdatescript}-cjk \ - echo ' if [ -x $adobecidfontconfig ]; then' >> %{__fontsupdatescript}-cjk \ + echo ' if [ -x /usr/sbin/acroread-cidfont-config ]; then' >> %{__fontsupdatescript}-cjk \ echo ' /usr/sbin/acroread-cidfont-config' >> %{__fontsupdatescript}-cjk \ echo ' fi' >> %{__fontsupdatescript}-cjk \ - echo ' if [ -x $ghostscriptcjkconfig ]; then' >> %{__fontsupdatescript}-cjk \ + echo ' if [ -x /usr/sbin/ghostscript-cjk-config ]; then' >> %{__fontsupdatescript}-cjk \ echo ' /usr/sbin/ghostscript-cjk-config' >> %{__fontsupdatescript}-cjk \ echo ' fi' >> %{__fontsupdatescript}-cjk \ echo ' rm %{__fontsconfigrunflag}-cjk' >> %{__fontsupdatescript} \ From babb1c25bedb0d4608c259a917c346239d9de7536e11a10df3cc950e0bd52cf4 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Tue, 15 Oct 2013 11:17:39 +0000 Subject: [PATCH 2/2] - fixed minor typo in %reconfigure_fonts_post macro [bnc#845955] OBS-URL: https://build.opensuse.org/package/show/M17N:fonts/fontpackages?expand=0&rev=21 --- fontpackages.changes | 5 +++++ rpm-macros.fonts-config | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/fontpackages.changes b/fontpackages.changes index bf359cf..34e6224 100644 --- a/fontpackages.changes +++ b/fontpackages.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Oct 15 11:16:42 UTC 2013 - pgajdos@suse.com + +- fixed minor typo in %reconfigure_fonts_post macro [bnc#845955] + ------------------------------------------------------------------- Mon Oct 14 06:05:19 UTC 2013 - pgajdos@suse.com diff --git a/rpm-macros.fonts-config b/rpm-macros.fonts-config index 677fbd7..c24183d 100644 --- a/rpm-macros.fonts-config +++ b/rpm-macros.fonts-config @@ -121,7 +121,7 @@ Requires(pre): perl aaa_base \ echo ' if [ -x /usr/sbin/ghostscript-cjk-config ]; then' >> %{__fontsupdatescript}-cjk \ echo ' /usr/sbin/ghostscript-cjk-config' >> %{__fontsupdatescript}-cjk \ echo ' fi' >> %{__fontsupdatescript}-cjk \ - echo ' rm %{__fontsconfigrunflag}-cjk' >> %{__fontsupdatescript} \ + echo ' rm %{__fontsconfigrunflag}-cjk' >> %{__fontsupdatescript}-cjk \ echo 'fi' >> %{__fontsupdatescript}-cjk \ echo 'rm %{__fontsupdatescript}-cjk' >> %{__fontsupdatescript}-cjk \ } \