aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Vigier <boklm@mageia.org>2011-03-13 20:20:09 (GMT)
committerNicolas Vigier <boklm@mageia.org>2011-03-13 20:20:09 (GMT)
commitd5ad8abe300c2da4bad79faf952673246bd00c47 (patch)
treee1f9e42089a3ae2a3b664b6c330e08c4ca48be58
parent58d76c079721fa089a2ead43167cc6acfa6cc5be (diff)
add fontconfig.prov provides script1.123
-rw-r--r--Makefile.am3
-rw-r--r--NEWS3
-rw-r--r--configure.ac2
-rwxr-xr-xfind-provides.in6
-rwxr-xr-xfontconfig.prov22
5 files changed, 34 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index d253892..1673421 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -49,7 +49,8 @@ pkg_scripts = \
php.req \
pkgconfigdeps.sh \
pythoneggs.py \
- rubygems.rb
+ rubygems.rb \
+ fontconfig.prov
pkg_gscripts = \
find-provides \
diff --git a/NEWS b/NEWS
index 6d3ead4..47cd021 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+Version 1.123 - 13 March 2011, by Nicolas Vigier
+- add fontconfig.prov provides script
+
Version 1.122 - 4 March 2011, by Nicolas Vigier
- kmod.prov: exit 0 when there is no error
- check if pkgconfig version is defined, or exit with an error
diff --git a/configure.ac b/configure.ac
index 7ea0207..e5aeaa9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
# $Id: configure.ac 271266 2010-11-04 10:43:28Z fwang $
AC_PREREQ(2.59)
-AC_INIT(rpm-mageia-setup, 1.122, boklm@mars-attacks.org)
+AC_INIT(rpm-mageia-setup, 1.123, boklm@mars-attacks.org)
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE(1.9 -Wno-portability)
AC_CONFIG_SRCDIR
diff --git a/find-provides.in b/find-provides.in
index bed7c13..3fdf3cf 100755
--- a/find-provides.in
+++ b/find-provides.in
@@ -80,6 +80,12 @@ done | sort -u
echo "$filelist" | tr '[:blank:]' \\n | @RPMVENDORDIR@/pkgconfigdeps.sh -P | sort -u \
&& test ${PIPESTATUS[2]} -ne 0 && echo 'error: @RPMVENDORDIR@/pkgconfigdeps.sh failed' >&2 && exit 1
+#
+# --- fonts
+[ -x @RPMVENDORDIR@/fontconfig.prov ] &&
+ echo "$filelist" | tr '[:blank:]' \\n | @RPMVENDORDIR@/fontconfig.prov --provides | sort -u \
+ && test ${PIPESTATUS[2]} -ne 0 && echo 'error: @RPMVENDORDIR@/fontconfig.prov failed' >&2 && exit 1
+
if [ -n "$LIBTOOLDEP" ]; then
#
# --- libtooldep deps
diff --git a/fontconfig.prov b/fontconfig.prov
new file mode 100755
index 0000000..73f345c
--- /dev/null
+++ b/fontconfig.prov
@@ -0,0 +1,22 @@
+#!/bin/bash
+#
+# Script to install in:
+# /usr/lib/rpm/mageia/find-provides.d
+#
+# Transform font files into RPM provides
+# Requires fontconfig >= 2.6.90
+#
+# Author: Behdad Esfahbod <behdad@redhat.com>
+# Based on other provides scripts from RPM
+#
+
+fcquery=/usr/bin/fc-query
+
+[ -x $fcquery ] || exit 0
+
+# 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