]>
Commit | Line | Data |
---|---|---|
70f8787d JR |
1 | --- rpm-5.4.9/macros/macros.rpmbuild.in.font~ 2012-05-15 02:55:46.222011889 +0200 |
2 | +++ rpm-5.4.9/macros/macros.rpmbuild.in 2012-05-15 02:55:46.347012566 +0200 | |
3 | @@ -682,5 +682,8 @@ done \ | |
4 | ||
5 | %requires_eq() %(echo '%*' | LC_ALL="C" xargs -r rpm -q --qf 'Requires: %%{name} = %%{epoch}:%%{version}\\n' | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not") | |
6 | ||
7 | +%__font_provides %{_rpmhome}/fontconfig.prov | |
8 | +#%__font_requires %{_rpmhome}/fontconfig.req | |
9 | + | |
10 | # \endverbatim | |
11 | #*/ | |
12 | --- rpm-5.4.9/scripts/fontconfig.prov.font~ 2012-05-15 02:55:46.347012566 +0200 | |
13 | +++ rpm-5.4.9/scripts/fontconfig.prov 2012-05-15 02:55:46.347012566 +0200 | |
14 | @@ -0,0 +1,24 @@ | |
15 | +#!/bin/bash | |
16 | +# | |
17 | +# Script to install in: | |
18 | +# /usr/lib/rpm/redhat/find-provides.d | |
19 | +# | |
20 | +# Transform font files into RPM provides | |
21 | +# Requires fontconfig >= 2.6.90 | |
22 | +# | |
23 | +# Author: Behdad Esfahbod <behdad@redhat.com> | |
24 | +# Based on other provides scripts from RPM | |
25 | +# | |
26 | + | |
27 | +fcquery=/usr/bin/fc-query | |
28 | + | |
29 | +if [ ! -x $fcquery ]; then | |
30 | + cat > /dev/null | |
31 | + exit 0 | |
32 | +fi | |
33 | + | |
34 | +# filter out anything outside main fontconfig path | |
35 | +grep /usr/share/fonts/ | | |
36 | +while read fn; do | |
37 | + $fcquery --format '%{=pkgkit}' "${fn}" 2> /dev/null | |
38 | +done | |
39 | --- rpm-5.4.9/scripts/Makefile.am.font~ 2012-05-15 02:55:46.304012334 +0200 | |
40 | +++ rpm-5.4.9/scripts/Makefile.am 2012-05-15 02:55:46.347012566 +0200 | |
41 | @@ -19,7 +19,7 @@ EXTRA_DIST = api-sanity-autotest.pl api- | |
42 | cpanflute cpanflute2 Specfile.pm \ | |
43 | find-provides.perl find-requires.perl \ | |
44 | find-provides.php find-requires.php \ | |
45 | - freshen.sh gendiff getpo.sh http.req \ | |
46 | + freshen.sh fontconfig.prov gendiff getpo.sh http.req \ | |
47 | check-java-closure.sh java.prov.sh java.req.sh \ | |
48 | gstreamer.sh javadeps.sh libtooldeps.sh mgo \ | |
49 | mono-find-provides mono-find-requires \ | |
50 | @@ -55,8 +55,8 @@ pkgdata_SCRIPTS = \ | |
51 | brp-strip-shared brp-strip-static-archive brp-sparc64-linux \ | |
52 | check-files cross-build dbconvert.sh executabledeps.sh \ | |
53 | find-debuginfo.sh find-lang.sh find-prov.pl find-req.pl \ | |
54 | - find-provides.perl \ | |
55 | - find-requires.perl gem_helper.rb getpo.sh http.req \ | |
56 | + find-provides.perl find-requires.perl \ | |
57 | + fontconfig.prov gem_helper.rb getpo.sh http.req \ | |
58 | kmod-deps.sh gstreamer.sh javadeps.sh libtooldeps.sh \ | |
59 | mono-find-provides mono-find-requires \ | |
60 | check-multiarch-files mkmultiarch \ |