- Correct the rpm provide name to be font(), not Font().

This commit is contained in:
Richard Hughes 2009-02-16 11:34:37 +00:00
parent 1554f5daeb
commit dabeffb2c0
2 changed files with 21 additions and 1 deletions

View File

@ -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:-<unknown filename>|basename}: \"%{family[0]:-<unknown family>}\" \"%{style[0]:-<unknown style>}\""
#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

View File

@ -3,7 +3,7 @@
Summary: Font configuration and customization library Summary: Font configuration and customization library
Name: fontconfig Name: fontconfig
Version: 2.6.97 Version: 2.6.97
Release: 2.g945d6a4%{?dist} Release: 3.g945d6a4%{?dist}
License: MIT License: MIT
Group: System Environment/Libraries Group: System Environment/Libraries
Source: http://fontconfig.org/release/fontconfig-%{version}.tar.gz Source: http://fontconfig.org/release/fontconfig-%{version}.tar.gz
@ -11,6 +11,9 @@ URL: http://fontconfig.org
BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRoot: %{_tmppath}/%{name}-%{version}-root
Source1: 25-no-bitmap-fedora.conf 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: gawk
BuildRequires: expat-devel BuildRequires: expat-devel
BuildRequires: freetype-devel >= %{freetype_version} BuildRequires: freetype-devel >= %{freetype_version}
@ -44,6 +47,7 @@ will use fontconfig.
%prep %prep
%setup -q %setup -q
%patch1 -p1
%build %build
@ -131,6 +135,9 @@ fi
%{_mandir}/man3/* %{_mandir}/man3/*
%changelog %changelog
* Mon Feb 16 2009 Richard Hughes <rhughes@redhat.com> - 2.6.97-3.g945d6a4
- Correct the rpm provide name to be font(), not Font().
* Sun Feb 15 2009 Behdad Esfahbod <besfahbo@redhat.com> - 2.6.97-2.g945d6a4 * Sun Feb 15 2009 Behdad Esfahbod <besfahbo@redhat.com> - 2.6.97-2.g945d6a4
- Another try. - Another try.