rpms/fontconfig
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- update to 2.3.97

Browse Source 
- Drop upstreamed patches
- Regenerate defaultconfig patch
- Don't touch stamp as it was not ever needed
This commit is contained in:
besfahbo 2006-09-07 21:41:05 +00:00
parent e0b8f8ce1b
commit 2c0d4824a4
3 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1 +1 @@
fontconfig-2.3.95.tar.gz fontconfig-2.3.97.tar.gz

23
fontconfig.spec
View File

@ -2,8 +2,8 @@
Summary: Font configuration and customization library Summary: Font configuration and customization library
Name: fontconfig Name: fontconfig
Version: 2.3.95 Version: 2.3.97
Release: 11%{?dist} Release: 1%{?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
@ -12,13 +12,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root
Source1: 40-blacklist-fonts.conf Source1: 40-blacklist-fonts.conf
Source2: 50-no-hint-fonts.conf Source2: 50-no-hint-fonts.conf
Patch1: fontconfig-2.3.95-defaultconfig.patch Patch1: fontconfig-2.3.97-defaultconfig.patch
Patch2: fontconfig-2.3.93.cvs20060211-move-user-cache.patch
Patch3: fontconfig-2.4-cmap-parsing.patch Patch3: fontconfig-2.4-cmap-parsing.patch
Patch4: fontconfig-2.3.95-ttf-collections.patch
Patch5: fontconfig-2.3.95-fd-leak.patch
Patch6: fontconfig-2.3.95-fix-page-size-overflow.patch
Patch7: fontconfig-2.3.95-zysong01.patch
BuildRequires: freetype-devel >= %{freetype_version} BuildRequires: freetype-devel >= %{freetype_version}
BuildRequires: expat-devel BuildRequires: expat-devel
@ -55,12 +50,7 @@ will use fontconfig.
%setup -q %setup -q
%patch1 -p1 -b .defaultconfig %patch1 -p1 -b .defaultconfig
%patch2 -p1 -b .move-user-cache
%patch3 -p1 -b .cmap-parsing %patch3 -p1 -b .cmap-parsing
%patch4 -p1 -b .ttf-collections
%patch5 -p1 -b .fd-leak
%patch6 -p1 -b .fix-page-size-overflow
%patch7 -p1 -b .zysong01
%build %build
%configure --with-add-fonts=/usr/share/X11/fonts/Type1,/usr/share/X11/fonts/OTF %configure --with-add-fonts=/usr/share/X11/fonts/Type1,/usr/share/X11/fonts/OTF
@ -105,7 +95,6 @@ rm -rf $RPM_BUILD_ROOT
umask 0022 umask 0022
mkdir -p %{_localstatedir}/cache/fontconfig mkdir -p %{_localstatedir}/cache/fontconfig
touch %{_localstatedir}/cache/fontconfig/stamp
# Force regeneration of all fontconfig cache files # Force regeneration of all fontconfig cache files
# The check for existance is needed on dual-arch installs (the second # The check for existance is needed on dual-arch installs (the second
@ -147,6 +136,12 @@ fi
%{_mandir}/man3/* %{_mandir}/man3/*
%changelog %changelog
* Thu Sep 07 2006 Behdad Esfahbod <besfahbo@redhat.com> - 2.3.97-1
- update to 2.3.97
- Drop upstreamed patches
- Regenerate defaultconfig patch
- Don't touch stamp as it was not ever needed
* Thu Aug 17 2006 Behdad Esfahbod <besfahbo@redhat.com> - 2.3.95-11 * Thu Aug 17 2006 Behdad Esfahbod <besfahbo@redhat.com> - 2.3.95-11
- inclusion of zhong yi font and rearranged font prefer list. (bug# 201300) - inclusion of zhong yi font and rearranged font prefer list. (bug# 201300)

2
sources
View File

@ -1 +1 @@
6860be35882f6d34636d52345efd5944 fontconfig-2.3.95.tar.gz c7c7a1866341d73455271ad14d8db54e fontconfig-2.3.97.tar.gz