From dabeffb2c076000a4f3dfa87476bce88846fbc52 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Mon, 16 Feb 2009 11:34:37 +0000 Subject: [PATCH] - Correct the rpm provide name to be font(), not Font(). --- fontconfig-2.6.97-fix-provides-name.patch | 13 +++++++++++++ fontconfig.spec | 9 ++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 fontconfig-2.6.97-fix-provides-name.patch diff --git a/fontconfig-2.6.97-fix-provides-name.patch b/fontconfig-2.6.97-fix-provides-name.patch new file mode 100644 index 0000000..650b785 --- /dev/null +++ b/fontconfig-2.6.97-fix-provides-name.patch @@ -0,0 +1,13 @@ +diff -urp fontconfig-2.6.97.old/src/fcformat.c fontconfig-2.6.97/src/fcformat.c +--- fontconfig-2.6.97.old/src/fcformat.c 2009-02-16 11:14:54.000000000 +0000 ++++ fontconfig-2.6.97/src/fcformat.c 2009-02-16 11:17:01.000000000 +0000 +@@ -73,7 +73,7 @@ + + #define FCMATCH_FORMAT "%{file:-|basename}: \"%{family[0]:-}\" \"%{style[0]:-}\"" + #define FCLIST_FORMAT "%{?file{%{file}: }}%{=unparse}" +-#define PKGKIT_FORMAT "%{[]family{Font(%{family|downcase|delete( )})\n}}%{[]lang{Font(:lang=%{lang|downcase|translate(_,-)})\n}}" ++#define PKGKIT_FORMAT "%{[]family{font(%{family|downcase|delete( )})\n}}%{[]lang{font(:lang=%{lang|downcase|translate(_,-)})\n}}" + + + static void + diff --git a/fontconfig.spec b/fontconfig.spec index a17f54a..b2b90de 100644 --- a/fontconfig.spec +++ b/fontconfig.spec @@ -3,7 +3,7 @@ Summary: Font configuration and customization library Name: fontconfig Version: 2.6.97 -Release: 2.g945d6a4%{?dist} +Release: 3.g945d6a4%{?dist} License: MIT Group: System Environment/Libraries Source: http://fontconfig.org/release/fontconfig-%{version}.tar.gz @@ -11,6 +11,9 @@ URL: http://fontconfig.org BuildRoot: %{_tmppath}/%{name}-%{version}-root Source1: 25-no-bitmap-fedora.conf +# behdad has this in his local tree +Patch1: fontconfig-2.6.97-fix-provides-name.patch + BuildRequires: gawk BuildRequires: expat-devel BuildRequires: freetype-devel >= %{freetype_version} @@ -44,6 +47,7 @@ will use fontconfig. %prep %setup -q +%patch1 -p1 %build @@ -131,6 +135,9 @@ fi %{_mandir}/man3/* %changelog +* Mon Feb 16 2009 Richard Hughes - 2.6.97-3.g945d6a4 +- Correct the rpm provide name to be font(), not Font(). + * Sun Feb 15 2009 Behdad Esfahbod - 2.6.97-2.g945d6a4 - Another try.