mirror of
https://abf.rosa.ru/djam/rpm.git
synced 2025-02-24 02:43:06 +00:00
72 lines
2.8 KiB
Diff
72 lines
2.8 KiB
Diff
--- rpm-5.4.5/lib/rpmfc.c.font~ 2012-03-02 21:45:43.550978693 +0100
|
|
+++ rpm-5.4.5/lib/rpmfc.c 2012-03-02 22:24:18.854132722 +0100
|
|
@@ -967,6 +967,11 @@ static int rpmfcSCRIPT(rpmfc fc)
|
|
#endif
|
|
xx = rpmfcHelper(fc, 'R', "ruby");
|
|
} else
|
|
+ if (fc->fcolor->vals[fc->ix] & RPMFC_FONT) {
|
|
+ xx = rpmfcHelper(fc, 'P', "font");
|
|
+ /* XXX: currently of no use, but for the sake of consistency... */
|
|
+ xx = rpmfcHelper(fc, 'R', "font");
|
|
+ } else
|
|
if (fc->fcolor->vals[fc->ix] & RPMFC_HASKELL) {
|
|
xx = rpmfcHelper(fc, 'P', "haskell");
|
|
xx = rpmfcHelper(fc, 'R', "haskell");
|
|
@@ -1102,7 +1107,7 @@ typedef struct rpmfcApplyTbl_s {
|
|
/*@unchecked@*/
|
|
static struct rpmfcApplyTbl_s rpmfcApplyTable[] = {
|
|
{ rpmfcELF, RPMFC_ELF },
|
|
- { rpmfcSCRIPT, (RPMFC_SCRIPT|RPMFC_HASKELL|RPMFC_RUBY|RPMFC_PERL|RPMFC_PYTHON|RPMFC_LIBTOOL|RPMFC_PKGCONFIG|RPMFC_BOURNE|RPMFC_JAVA|RPMFC_PHP|RPMFC_MONO) },
|
|
+ { rpmfcSCRIPT, (RPMFC_SCRIPT|RPMFC_FONT|RPMFC_HASKELL|RPMFC_RUBY|RPMFC_PERL|RPMFC_PYTHON|RPMFC_LIBTOOL|RPMFC_PKGCONFIG|RPMFC_BOURNE|RPMFC_JAVA|RPMFC_PHP|RPMFC_MONO) },
|
|
#if defined(RPM_VENDOR_MANDRIVA)
|
|
{ rpmfcSYMLINK, RPMFC_SYMLINK },
|
|
#endif
|
|
--- rpm-5.4.5/macros/macros.rpmbuild.in.font~ 2012-03-02 21:45:18.578966245 +0100
|
|
+++ rpm-5.4.5/macros/macros.rpmbuild.in 2012-03-02 21:51:00.124136485 +0100
|
|
@@ -682,5 +682,8 @@ done \
|
|
|
|
%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")
|
|
|
|
+%__font_provides %{_rpmhome}/fontconfig.prov
|
|
+#%__font_requires %{_rpmhome}/fontconfig.req
|
|
+
|
|
# \endverbatim
|
|
#*/
|
|
--- rpm-5.4.5/scripts/fontconfig.prov.font~ 2012-03-02 21:51:25.438149103 +0100
|
|
+++ rpm-5.4.5/scripts/fontconfig.prov 2012-03-02 21:51:19.028145906 +0100
|
|
@@ -0,0 +1,24 @@
|
|
+#!/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
|
|
--- rpm-5.4.5/scripts/Makefile.am.font~ 2012-03-02 22:25:49.684177995 +0100
|
|
+++ rpm-5.4.5/scripts/Makefile.am 2012-03-02 22:25:51.273178788 +0100
|
|
@@ -19,7 +19,7 @@ EXTRA_DIST = abi-compliance-checker.pl a
|
|
cpanflute cpanflute2 Specfile.pm \
|
|
find-provides.perl find-requires.perl \
|
|
find-provides.php find-requires.php \
|
|
- freshen.sh gendiff getpo.sh haskelldeps.sh http.req \
|
|
+ freshen.sh fontconfig.prov gendiff getpo.sh haskelldeps.sh http.req \
|
|
check-java-closure.sh java.prov.sh java.req.sh \
|
|
gstreamer.sh javadeps.sh libtooldeps.sh mgo \
|
|
mono-find-provides mono-find-requires \
|