diff --git a/.cvsignore b/.cvsignore index 6f2b7aa..cc5e5f0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -fontconfig-2.6.97.tar.gz +fontconfig-2.6.98.tar.gz diff --git a/fontconfig-2.6.97-fix-provides-name.patch b/fontconfig-2.6.97-fix-provides-name.patch deleted file mode 100644 index 650b785..0000000 --- a/fontconfig-2.6.97-fix-provides-name.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 9b979e3..ed380aa 100644 --- a/fontconfig.spec +++ b/fontconfig.spec @@ -2,8 +2,8 @@ Summary: Font configuration and customization library Name: fontconfig -Version: 2.6.97 -Release: 5.g945d6a4%{?dist} +Version: 2.6.98 +Release: 1.gb39c36a%{?dist} License: MIT Group: System Environment/Libraries Source: http://fontconfig.org/release/fontconfig-%{version}.tar.gz @@ -11,9 +11,6 @@ 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} @@ -47,7 +44,6 @@ will use fontconfig. %prep %setup -q -%patch1 -p1 %build @@ -135,6 +131,9 @@ fi %{_mandir}/man3/* %changelog +* Tue Mar 10 2009 Behdad Esfahbod - 2.6.98-1.gb39c36a +- Update to 2.6.98-1.gb39c36a + * Tue Feb 24 2009 Fedora Release Engineering - 2.6.97-5.g945d6a4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild diff --git a/sources b/sources index 7ee9ca5..ce397d4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -addd72182847a156db9f5f7aa7fb6e91 fontconfig-2.6.97.tar.gz +8468c848937965e13b66a88b0bf231b9 fontconfig-2.6.98.tar.gz