From cbf56a61beceb740a29295ce2f4fc47db239f55a Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 04:47:22 +0000 Subject: [PATCH] auto-import changelog data from fontconfig-0.0.1.020811.1151-6.src.rpm Thu Aug 15 2002 Owen Taylor - Try once more to get the right default Sans-serif font :-( - Switch the Sans/Monospace aliases for Korean to Gulim, not Dotum Wed Aug 14 2002 Owen Taylor - Fix %post Tue Aug 13 2002 Owen Taylor - Fix lost Luxi Sans default Mon Aug 12 2002 Owen Taylor - Upgrade to rc2 - Turn off hinting for all CJK fonts - Fix typo in %post - Remove the custom language tag stuff in favor of Keith's standard solution. Mon Jul 15 2002 Owen Taylor - Prefer Luxi Sans to Nimbus Sans again Fri Jul 12 2002 Owen Taylor - Add FC_HINT_STYLE to FcBaseObjectTypes - Switch Chinese fonts to always using Sung-ti / Ming-ti, and never Kai-ti - Add ZYSong18030 to aliases (#68428) Wed Jul 10 2002 Owen Taylor - Fix a typo in the langtag patch (caught by Erik van der Poel) Wed Jul 03 2002 Owen Taylor - Add FC_HINT_STYLE tag Thu Jun 27 2002 Owen Taylor - New upstream version, with fix for problems with ghostscript-fonts (Fonts don't work for Qt+CJK, etc.) Wed Jun 26 2002 Owen Taylor - New upstream version, fixing locale problem Mon Jun 24 2002 Owen Taylor - Add a hack where we set the "language" fontconfig property based on the locale, then we conditionalize base on that in the fonts.conf file. Sun Jun 23 2002 Owen Taylor - New upstream version Tue Jun 18 2002 Owen Taylor - Fix crash from FcObjectSetAdd Tue Jun 11 2002 Owen Taylor - make fonts.conf %config, not %config(noreplace) - Another try at the CJK aliases - Add some CJK fonts to the config - Prefer Luxi Mono to Nimbus Mono Mon Jun 10 2002 Owen Taylor - New upstream version - Fix matching for bitmap fonts --- .cvsignore | 2 +- fontconfig.spec | 112 +++++++++++++++++++++++++++++++++++++++--------- sources | 2 +- 3 files changed, 94 insertions(+), 22 deletions(-) diff --git a/.cvsignore b/.cvsignore index 147bcab..d4c92dc 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -fcpackage.02-06-03.01-31.tar.gz +fcpackage.rc2.tar.gz diff --git a/fontconfig.spec b/fontconfig.spec index d1e5152..80f2589 100644 --- a/fontconfig.spec +++ b/fontconfig.spec @@ -1,17 +1,22 @@ -%define fcpackage_version 02-06-03.01-31 -%define relno 020603.0131 +%define fcpackage_version rc2 +%define relno 020811.1151 -%define freetype_version 2.0.9 +%define freetype_version 2.1.2-2 Summary: Font configuration and customization library Name: fontconfig Version: 0.0.1.%{relno} -Release: 3 +Release: 6 License: MIT Group: System Environment/Libraries Source: http://keithp.com/fonts/pub/fcpackage.%{fcpackage_version}.tar.gz URL: http://keithp.com/fonts BuildRoot: %{_tmppath}/fontconfig-%{PACKAGE_VERSION}-root +Patch1: fontconfig-0.0.1.020811.1151-defaultconfig.patch +Patch4: fontconfig-0.0.1.020811.1151-slighthint.patch +# Only look in /usr/X11R6/lib/fonts/Type1, not in +# all of /usr/X11R6/lib/fonts. +Patch5: fontconfig-0.0.1.020626.1517-fontdir.patch BuildRequires: freetype-devel >= %{freetype_version} BuildRequires: expat-devel @@ -34,21 +39,12 @@ and developer docs for the fontconfig package. Install fontconfig-devel if you want to develop programs which will use fontconfig. -%changelog -* Fri Jun 07 2002 Havoc Pennington -- rebuild in different environment - -* Mon Jun 3 2002 Owen Taylor -- New version, new upstream mega-tarball - -* Tue May 28 2002 Owen Taylor -- Fix problem with FcConfigSort - -* Fri May 24 2002 Owen Taylor -- Initial specfile - %prep -%setup -n fcpackage.%{fcpackage_version}/fontconfig +%setup -q -n fcpackage.%{fcpackage_version}/fontconfig + +%patch1 -p1 -b .defaultconfig +%patch4 -p1 -b .slighthint +%patch5 -p1 -b .fontdir %build @@ -65,7 +61,13 @@ install -m 0644 src/fontconfig.man $RPM_BUILD_ROOT%{_mandir}/man3/fontconfig.3 %clean rm -rf $RPM_BUILD_ROOT -%post -p /sbin/ldconfig +%post +/sbin/ldconfig + +# Force regeneration of all fontconfig cache files. +# The redirect is because fc-cache is giving warnings about ~/fc.cache +# the HOME setting is to avoid problems if HOME hasn't been reset +HOME=/root fc-cache -f 2>/dev/null %postun -p /sbin/ldconfig @@ -77,7 +79,7 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/fc-list %dir %{_sysconfdir}/fonts %{_sysconfdir}/fonts/fonts.dtd -%config(noreplace) %{_sysconfdir}/fonts/fonts.conf +%config %{_sysconfdir}/fonts/fonts.conf %files devel %defattr(-, root, root) @@ -86,3 +88,73 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/fontconfig %{_bindir}/fontconfig-config %{_mandir}/man3/fontconfig.3* + +%changelog +* Thu Aug 15 2002 Owen Taylor +- Try once more to get the right default Sans-serif font :-( +- Switch the Sans/Monospace aliases for Korean to Gulim, not Dotum + +* Wed Aug 14 2002 Owen Taylor +- Fix %%post + +* Tue Aug 13 2002 Owen Taylor +- Fix lost Luxi Sans default + +* Mon Aug 12 2002 Owen Taylor +- Upgrade to rc2 +- Turn off hinting for all CJK fonts +- Fix typo in %%post +- Remove the custom language tag stuff in favor of Keith's standard + solution. + +* Mon Jul 15 2002 Owen Taylor +- Prefer Luxi Sans to Nimbus Sans again + +* Fri Jul 12 2002 Owen Taylor +- Add FC_HINT_STYLE to FcBaseObjectTypes +- Switch Chinese fonts to always using Sung-ti / Ming-ti, and never Kai-ti +- Add ZYSong18030 to aliases (#68428) + +* Wed Jul 10 2002 Owen Taylor +- Fix a typo in the langtag patch (caught by Erik van der Poel) + +* Wed Jul 3 2002 Owen Taylor +- Add FC_HINT_STYLE tag + +* Thu Jun 27 2002 Owen Taylor +- New upstream version, with fix for problems with + ghostscript-fonts (Fonts don't work for Qt+CJK, + etc.) + +* Wed Jun 26 2002 Owen Taylor +- New upstream version, fixing locale problem + +* Mon Jun 24 2002 Owen Taylor +- Add a hack where we set the "language" fontconfig property based on the locale, then + we conditionalize base on that in the fonts.conf file. + +* Sun Jun 23 2002 Owen Taylor +- New upstream version + +* Tue Jun 18 2002 Owen Taylor +- Fix crash from FcObjectSetAdd + +* Tue Jun 11 2002 Owen Taylor +- make fonts.conf %%config, not %%config(noreplace) +- Another try at the CJK aliases +- Add some CJK fonts to the config +- Prefer Luxi Mono to Nimbus Mono + +* Mon Jun 10 2002 Owen Taylor +- New upstream version +- Fix matching for bitmap fonts + +* Mon Jun 3 2002 Owen Taylor +- New version, new upstream mega-tarball + +* Tue May 28 2002 Owen Taylor +- Fix problem with FcConfigSort + +* Fri May 24 2002 Owen Taylor +- Initial specfile + diff --git a/sources b/sources index b7066ce..3b5c077 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ba7284fe90ef44187eaafeada08001e8 fcpackage.02-06-03.01-31.tar.gz +abde140cece39a3dd2b114df7eb66a33 fcpackage.rc2.tar.gz