diff --git a/fonts-config b/fonts-config index 1da955d..44c9f88 100644 --- a/fonts-config +++ b/fonts-config @@ -1703,7 +1703,7 @@ sub generate_java_font_setup { my @font_properties_ja_globs = ("/usr/lib*/jvm/java-1[._]4[._]?-sun-*/jre/lib/font.properties.ja"); my $font_properties_ja_template_file = "/usr/share/fonts-config/font.properties.ja.template"; my $font_properties_ja_template = ""; - my @fontconfig_SuSE_properties_globs = "/usr/lib*/jvm/java-1.5.?-sun-*/jre/lib/fontconfig.SuSE.properties"; + my @fontconfig_SuSE_properties_globs = "/usr/lib*/jvm/jre/lib/fontconfig.SuSE.properties"; my $fontconfig_SuSE_properties_template_file = "/usr/share/fonts-config/fontconfig.SuSE.properties.template"; my $fontconfig_SuSE_properties_template = ""; diff --git a/fonts-config.changes b/fonts-config.changes index b47a787..0e58eb9 100644 --- a/fonts-config.changes +++ b/fonts-config.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Apr 26 17:40:34 CEST 2010 - pgajdos@suse.cz + +- fixed java's fontconfig.SuSE.properties location [bnc#591706] + ------------------------------------------------------------------- Wed Jan 28 17:17:26 CET 2009 - mfabian@suse.de diff --git a/fonts-config.spec b/fonts-config.spec index 837173f..5b0e473 100644 --- a/fonts-config.spec +++ b/fonts-config.spec @@ -1,7 +1,7 @@ # # spec file for package fonts-config (Version 20080121) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,17 +19,15 @@ Name: fonts-config -License: GPL v2 or later +License: GPLv2+ Group: System/X11/Fonts Provides: xf86tools:/usr/sbin/fonts-config AutoReqProv: on Requires: fontconfig >= 2.3.93.20060103 -%if %suse_version > 1000 Recommends: ft2demos -%endif PreReq: %fillup_prereq Version: 20080121 -Release: 52 +Release: 53 Summary: Configures Fonts for X Windows and other applications Source: fonts-config Source1: SuSEconfig.fonts @@ -89,183 +87,3 @@ exit 0 /var/adm/fillup-templates/sysconfig.fonts-config %changelog -* Wed Jan 28 2009 mfabian@suse.de -- apply patch by Egbert Eich to make handling of verbosity levels - consistent. -* Tue Jun 03 2008 mfabian@suse.de -- bnc#396611: prefer "AR PL ShanHeiSun Uni" (uming.ttf) over - FZMingTiB (/usr/share/fonts/truetype/FZMingTiB.ttf) for - traditional Chinese in Java 1.5 because the former has embedded - bitmaps and the latter has not. -* Mon Jan 21 2008 mfabian@suse.de -- fix recursive call of opendir() and closedir() to work with - Perl 5.10. -* Tue Dec 18 2007 mfabian@suse.de -- add "Lucida Sans Typewriter", "Lucida Sans", and "Lucida Bright" - to the list of fonts which should always use the byte code - interpreter if anti-aliasing is off. Suggested by - Bernhard Walle . -* Wed Oct 10 2007 mfabian@suse.de -- acroread directory moved again because of the update to 8.1.1. -* Tue Sep 25 2007 mfabian@suse.de -- Bugzilla #327035: Skip symlinks when searching for font file - names when generating the Java font setup. -* Thu Sep 06 2007 mfabian@suse.de -- Bugzilla #299432: add ‘Prereq: %%fillup_prereq’. -* Fri Mar 23 2007 mfabian@suse.de -- Bugzilla #118131 comment #93: set the autohinter default - matching on "font" instead of on "pattern". - If an autohint value is set in pattern, OpenOffice 2.1 will use - that even if there are fontconfig rules matching on "font" which - should override it again). This doesn't cause any problems for - Cairo/Gnome (see bug #104365) because Cairo/Gnome don't try to - change the autohint value anyway. -* Tue Jan 30 2007 mfabian@suse.de -- Bugzilla #239692: acroread moved to /usr/lib, add a new - glob pattern to the font directory list. -* Wed Nov 22 2006 mfabian@suse.de -- Bugzilla #222675: disable autohinter for PostScript fonts. -* Wed Nov 15 2006 mfabian@suse.de -- Bugzilla #215602: don't use the embedded bitmaps in the IPA - fonts because they are only available in 12, 14, and 16 pixels. -- Bugzilla #215602: Don't use the autohinter for fonts where it - it distorts the metrics so badly that even the digits which - should be monospaced are not monospaced at all anymore. -- Don't use the autohinter for good quality TrueType fonts. -* Wed Oct 25 2006 mfabian@suse.de -- Fate #300950: after the regular setup is done, source all scripts - in /usr/lib/fonts-config/conf.d which might do additional setup. -* Thu Sep 28 2006 mfabian@suse.de -- the OpenOffice font directory on x86_64 is - /usr/lib64/ooo-2.0/share/fonts/truetype/. -* Wed Sep 13 2006 mfabian@suse.de -- some fonts have more than one space in the family name, replace - them all with '_' where necessary in the Java setup. -* Tue Sep 12 2006 mfabian@suse.de -- improve Java 1.5 font setup for Chinese and Korean. -* Thu Aug 17 2006 mfabian@suse.de -- fix font paths in Java font setup for X11R7. -* Wed Aug 16 2006 mfabian@suse.de -- use "Recommends: ft2demos" only for SuSE Linux >= 10.1. -* Thu Aug 10 2006 mfabian@suse.de -- Bugzilla #195835: print a warning to stdout when the creation - of a Fontmap for Ghostscript has been requested but the 'ftdump' - binary is not available. Add "Recommends: ft2demos" to the .spec - file because the 'ft2demos' package contains 'ftdump'. Mention - 'ftdump' in the comment above GENERATE_GHOSTSCRIPT_FONTMAPS - in /etc/sysconfig/fonts-config. Mention ftdump in the manual page - as well. -* Mon Jul 03 2006 mfabian@suse.de -- Add path names for X11R7 - (patch by Stefan Dirsch ). -* Fri Apr 28 2006 mfabian@suse.de -- Bugzilla #104365: match on "pattern" instead on "font" to edit - the default hinting settings to make it easier to override - the defaults with applications using FcPatternDel() and - FcPatternAdd...(). -* Wed Apr 19 2006 schwab@suse.de -- Use /usr/bin/fc-cache-x86 when it exists. -* Tue Apr 11 2006 mfabian@suse.de -- Bugzilla #162978: also call /usr/bin/fc-cache64 if it exists - (for ppc64). -- never use '--force' when calling /usr/bin/fc-cache32 and - /usr/bin/fc-cache64. -* Mon Apr 03 2006 mfabian@suse.de -- Bugzilla #157441 comment #30 ff: make hintstyle=hintfull the - default. -- Bugzilla #160226: call /usr/bin/fc-cache32 if it exists. -* Fri Feb 10 2006 mfabian@suse.de -- Bugzilla #148359: do not touch /usr/X11R6/lib/X11/fonts in - SuSEconfig.fonts to find out whether this is on a readonly - file system. Even if it is on a readonly file system, caches - for fontconfig can still be generated in /var/cache/fontconfig. - And it might still be possible to generate fonts.dir/fonts.scale - files in other directories, i.e. /usr/sbin/fonts-config should - be started always. -* Tue Feb 07 2006 mfabian@suse.de -- Bugzilla #148361: generate /etc/fonts/suse-font-dirs.conf from - a template containing glob patterns to a full list of all - font directories to avoid that fontconfig calls stat () on all - files in all sub-directories. -* Wed Jan 25 2006 mls@suse.de -- converted neededforbuild to BuildRequires -* Mon Jan 09 2006 mfabian@suse.de -- Bugzilla #105626: Takashi IWAI made patches for - freetype2 to improve the autohinting (mainly for CJK fonts). - Now we don't need to switch off the autohinter for CJK fonts - any more. -* Wed Jan 04 2006 mfabian@suse.de -- update to 20060104: -- make it work better together with fontconfig 2.3.93.20060103 - and require fontconfig >= 2.3.93.20060103 -- remove old cruft which was used for Xft1 and older versions - of fontconfig -- write autogenerated files in /etc/fonts only if their contents - have changed, touching these files causes fontconfig to believe - that the caches are out of date. -- fix glob pattern for font.properties.ja (for java 1.4.2). -* Wed Jan 04 2006 mfabian@suse.de -- Bugzilla #131714: always use byte code interpreter for some - composite CJK fonts which cannot be rendered correctly with the - autohinter. Currently the only fonts I know which need this - are the traditional Chinese fonts MingLiU and PMingLiU. -* Thu Oct 27 2005 mfabian@suse.de -- Bugzilla #130350: add "Andale Sans", "Andy MT", "Bell MT", and - "Monotype Sorts" to the list of fonts which are rendered with - the byte code interpreter and without anti-aliasing up to the - pixellimit specified in /etc/sysconfig/fonts-config. - These fonts appear to have good byte code as well, the results - when rendered this way look OK. -* Thu Oct 27 2005 mfabian@suse.de -- revert last change because I downgraded to fontconfig - 2.3.2.20050721 (the version from SUSE 10.0) in STABLE. - This fontconfig version is solid and works reliable. The - fontconfig 2.4 branch will be checked into BETA and come - back to STABLE as soon as the crash problems are solved. -* Wed Oct 26 2005 mfabian@suse.de -- Bugzilla #128080: add option "--force" to the call of - fonts-config in SuSEconfig.fonts. - This is only a temporary workaround until the real problem - in fontconfig is fixed. With this workaround, SuSEconfig.fonts - needs a lot more time but at least it appears to work reliably. -* Thu Sep 29 2005 dmueller@suse.de -- add norootforbuild -* Thu Sep 08 2005 mfabian@suse.de -- Bugzilla #114949: - + really add variable to enable the byte code - interpreter to /etc/sysconfig/fonts-config. The last change - contained only the code to use this variable if available but - not the variable itself. - + add variables in /etc/sysconfig/fonts-config - to choose whether embedded bitmaps should be used and for - which languages. -* Tue Sep 06 2005 mfabian@suse.de -- Bugzilla #114949: add a variable in /etc/sysconfig/fonts-config - to choose whether black and white rendering using the byte code - interpreter should be used and up to which pixel size. -* Tue Sep 06 2005 mfabian@suse.de -- Bugzilla #79259 again: I found a bug in the autogeneration of - the Java font setup: sometimes "fc-list font file" may return - several results, for example if there are symlinks which point - to the same font and also if one of the CID-keyed fonts - created by the script /usr/sbin/acroread-cidfont-config happens - to have the same family name. These CID-keyed fonts and the - must be ignored, neither of them will work with Java. -* Mon Sep 05 2005 mfabian@suse.de -- Bugzilla #79259: add autogeneration of Java font configuration - files. -* Fri Mar 04 2005 mfabian@suse.de -- add missing %%prep section to .spec file. -* Mon Dec 06 2004 mfabian@suse.de -- Bugzilla #48603: don't try to write OpenOffice font-setup if - OpenOffice is not installed. -* Fri Oct 01 2004 mfabian@suse.de -- Bugzilla #46299: improve OpenOffice font setup for Japanese - for better on screen display and printing. -* Tue Jul 06 2004 mfabian@suse.de -- make package "noarch". -- make fonts which have spaces in the filename usable with - the X11 core font system by generating symbolic links. -- checkproc was still used without absolute path in one place. -* Wed May 05 2004 sndirsch@suse.de -- created package