diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-07-25 17:01:50 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-07-25 17:01:50 +0000 |
| commit | 1bffcf586ec0322d43c186da69ee141247cf3cf5 (patch) | |
| tree | 2a99c8b9596e35f9d1adad863b09aa28e2ee600b | |
| parent | 7f606854dcbbe0f74a1adccbd385239644089574 (diff) | |
| download | rpm-setup-1bffcf586ec0322d43c186da69ee141247cf3cf5.tar rpm-setup-1bffcf586ec0322d43c186da69ee141247cf3cf5.tar.gz rpm-setup-1bffcf586ec0322d43c186da69ee141247cf3cf5.tar.bz2 rpm-setup-1bffcf586ec0322d43c186da69ee141247cf3cf5.tar.xz rpm-setup-1bffcf586ec0322d43c186da69ee141247cf3cf5.zip | |
use upstream fonconfig.prov as we had exactly the same file
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | NEWS | 3 | ||||
| -rwxr-xr-x | find-provides.in | 6 | ||||
| -rwxr-xr-x | fontconfig.prov | 24 |
4 files changed, 5 insertions, 31 deletions
diff --git a/Makefile.am b/Makefile.am index a096292..807b011 100644 --- a/Makefile.am +++ b/Makefile.am @@ -50,8 +50,7 @@ pkg_scripts = \ php.req \ pkgconfigdeps.sh \ pythoneggs.py \ - rubygems.rb \ - fontconfig.prov + rubygems.rb pkg_gscripts = \ find-provides \ @@ -1,5 +1,4 @@ -- fonconfig.prov: sync with rpm.org - (fix potential error on font provide extraction (RhBug:609117)) +- use upstream fonconfig.prov as we had exactly the same file Version 1.147-12 - 24 Jul 2012, by Colin - Update location of the %_unitdir macro post-usrmove diff --git a/find-provides.in b/find-provides.in index b134058..38dc803 100755 --- a/find-provides.in +++ b/find-provides.in @@ -90,9 +90,9 @@ done | sort -u # # --- 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 +[ -x @RPMLIBDIR@/fontconfig.prov ] && + echo "$filelist" | tr '[:blank:]' \\n | @RPMLIBDIR@/fontconfig.prov --provides | sort -u \ + && test ${PIPESTATUS[2]} -ne 0 && echo 'error: @RPMLIBDIR@/fontconfig.prov failed' >&2 && exit 1 # # --- typelib() gobject-introspection bindings diff --git a/fontconfig.prov b/fontconfig.prov deleted file mode 100755 index bfb6ea0..0000000 --- a/fontconfig.prov +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash -# -# Script to install in: -# /usr/lib/rpm/redhat/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 - -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 |