aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS3
-rwxr-xr-xfontconfig.prov8
2 files changed, 8 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index 9ab6b49..46a10be 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+- fonconfig.prov: sync with rpm.org
+ (fix potential error on font provide extraction (RhBug:609117))
+
Version 1.147-12 - 24 Jul 2012, by Colin
- Update location of the %_unitdir macro post-usrmove
diff --git a/fontconfig.prov b/fontconfig.prov
index 73f345c..bfb6ea0 100755
--- a/fontconfig.prov
+++ b/fontconfig.prov
@@ -1,7 +1,7 @@
#!/bin/bash
#
# Script to install in:
-# /usr/lib/rpm/mageia/find-provides.d
+# /usr/lib/rpm/redhat/find-provides.d
#
# Transform font files into RPM provides
# Requires fontconfig >= 2.6.90
@@ -12,11 +12,13 @@
fcquery=/usr/bin/fc-query
-[ -x $fcquery ] || exit 0
+if [ ! -x $fcquery ]; then
+ cat > /dev/null
+ exit 0
+fi
# filter out anything outside main fontconfig path
grep /usr/share/fonts/ |
while read fn; do
$fcquery --format '%{=pkgkit}' "${fn}" 2> /dev/null
done
-exit 0