From 0285cf00cbd4cda7735e7aec518261d83f01437c3559f50cccd8e4f31424ecb4 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 17 Sep 2012 10:52:02 +0000 Subject: [PATCH] Accepting request 134635 from openSUSE:Factory:Staging - the script requires checkproc and killproc, otherwise it will start a xfs in buildroot (oops) OBS-URL: https://build.opensuse.org/request/show/134635 OBS-URL: https://build.opensuse.org/package/show/M17N/fonts-config?expand=0&rev=30 --- fonts-config | 5 +++++ fonts-config.changes | 6 ++++++ fonts-config.spec | 1 + 3 files changed, 12 insertions(+) diff --git a/fonts-config b/fonts-config index 37a6f37..af0ae31 100644 --- a/fonts-config +++ b/fonts-config @@ -573,6 +573,11 @@ if ($xset_bin) { } } +if (!$checkproc_bin || !$killproc_bin) { + print "This script needs checkproc and killproc installed to function\n"; + exit 1; +} + if ($xfs_bin && my_system ("$checkproc_bin $xfs_bin") == 0) { if ($VERBOSITY >= $VERBOSITY_DEBUG) { print "Reloading config file of X Font Server ...\n"; diff --git a/fonts-config.changes b/fonts-config.changes index 8c56a4e..2343b38 100644 --- a/fonts-config.changes +++ b/fonts-config.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Sep 17 08:44:38 UTC 2012 - coolo@suse.com + +- the script requires checkproc and killproc, otherwise it will start + a xfs in buildroot (oops) + ------------------------------------------------------------------- Tue Aug 28 14:18:59 UTC 2012 - pgajdos@suse.com diff --git a/fonts-config.spec b/fonts-config.spec index 78d6739..88c667f 100644 --- a/fonts-config.spec +++ b/fonts-config.spec @@ -32,6 +32,7 @@ Source8: suse-font-dirs.conf.template BuildRequires: fontconfig BuildRequires: fontpackages-devel Requires(pre): %fillup_prereq +Requires(pre): sysvinit-tools Requires: fontconfig >= 2.3.93.20060103 Requires: perl(English) Recommends: ft2demos