Hello community,
here is the log from the commit of package fonts-config
checked in at Mon Jul 3 13:58:56 CEST 2006.
--------
--- fonts-config/fonts-config.changes 2006-04-28 19:18:17.000000000 +0200
+++ fonts-config/fonts-config.changes 2006-07-03 12:36:06.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Jul 03 12:35:39 CEST 2006 - mfabian@suse.de
+
+- Add path names for X11R7
+ (patch by Stefan Dirsch ).
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ fonts-config.spec ++++++
--- /var/tmp/diff_new_pack.kaVDY4/_old 2006-07-03 13:58:19.000000000 +0200
+++ /var/tmp/diff_new_pack.kaVDY4/_new 2006-07-03 13:58:19.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package fonts-config (Version 20060210)
+# spec file for package fonts-config (Version 20060703)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -16,8 +16,8 @@
Provides: xf86tools:/usr/sbin/fonts-config
Autoreqprov: on
Requires: fontconfig >= 2.3.93.20060103
-Version: 20060210
-Release: 15
+Version: 20060703
+Release: 1
Summary: Configures Installed X Window System Fonts
Source: fonts-config
Source1: SuSEconfig.fonts
@@ -75,6 +75,9 @@
/var/adm/fillup-templates/sysconfig.fonts-config
%changelog -n fonts-config
+* 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
++++++ fonts-config ++++++
--- fonts-config/fonts-config 2006-04-19 11:44:17.000000000 +0200
+++ fonts-config/fonts-config 2006-07-03 12:35:14.000000000 +0200
@@ -199,8 +199,8 @@
my $script_start_time = time();
-my $cvs_id = '$Id: fonts-config,v 1.61 2006/04/11 13:11:56 mfabian Exp $';
-my $cvs_date = '$Date: 2006/04/11 13:11:56 $';
+my $cvs_id = '$Id: fonts-config,v 1.63 2006/07/03 10:34:55 mfabian Exp $';
+my $cvs_date = '$Date: 2006/07/03 10:34:55 $';
$cvs_date =~ /^\$[[:alpha:]]+: (.*) \$$/;
my $version = $1;
@@ -368,13 +368,13 @@
my $fc_cache64_bin = search_executable ("/usr/bin/fc-cache64");
my $fc_match_bin = search_executable ("/usr/bin/fc-match");
my $cidfont_x11_config_bin = search_executable ("/usr/sbin/cidfont-x11-config");
-my $xset_bin = search_executable ("/usr/X11R6/bin/xset");
-my $xfs_bin = search_executable ("/usr/X11R6/bin/xfs");
+my $xset_bin = search_executable ("/usr/bin/xset", "/usr/X11R6/bin/xset");
+my $xfs_bin = search_executable ("/usr/bin/xfs", "/usr/X11R6/bin/xfs");
my $checkproc_bin = search_executable ("/sbin/checkproc");
my $killproc_bin = search_executable ("/sbin/killproc");
-my $XFree86_bin = search_executable ("/usr/X11R6/bin/Xorg", "/usr/X11R6/bin/XFree86");
-my $mkfontscale_bin = search_executable ("/usr/X11R6/bin/mkfontscale");
-my $mkfontdir_bin = search_executable ("/usr/X11R6/bin/mkfontdir");
+my $XFree86_bin = search_executable ("/usr/bin/Xorg", "/usr/X11R6/bin/Xorg", "/usr/X11R6/bin/XFree86");
+my $mkfontscale_bin = search_executable ("/usr/bin/mkfontscale", "/usr/X11R6/bin/mkfontscale");
+my $mkfontdir_bin = search_executable ("/usr/bin/mkfontdir", "/usr/X11R6/bin/mkfontdir");
my $ftdump_bin = search_executable ("/usr/bin/ftdump");
my $xtt_module_used = 0;
@@ -639,6 +639,35 @@
sub x11_font_dirs {
my @dirs = ();
my @standard_dirs = (
+ "/usr/share/fonts/local",
+ "/usr/share/fonts/misc",
+ "/usr/share/fonts/75dpi",
+ "/usr/share/fonts/100dpi",
+ "/usr/share/fonts/Type1",
+ "/usr/share/fonts/URW",
+ "/usr/share/fonts/Speedo",
+ "/usr/share/fonts/PEX",
+ "/usr/share/fonts/cyrillic",
+ "/usr/share/fonts/latin2/misc",
+ "/usr/share/fonts/latin2/75dpi",
+ "/usr/share/fonts/latin2/100dpi",
+ "/usr/share/fonts/latin2/Type1",
+ "/usr/share/fonts/latin7/75dpi",
+ "/usr/share/fonts/baekmuk",
+ "/usr/share/fonts/japanese",
+ "/usr/share/fonts/kwintv",
+ "/usr/share/fonts/truetype",
+ "/usr/share/fonts/uni",
+ "/usr/share/fonts/CID",
+ "/usr/share/fonts/ucs/misc",
+ "/usr/share/fonts/ucs/75dpi",
+ "/usr/share/fonts/ucs/100dpi",
+ "/usr/share/fonts/hellas/misc",
+ "/usr/share/fonts/hellas/75dpi",
+ "/usr/share/fonts/hellas/100dpi",
+ "/usr/share/fonts/hellas/Type1",
+ "/usr/share/fonts/misc/sgi",
+ "/usr/share/fonts/xtest",
"/usr/X11R6/lib/X11/fonts/local",
"/usr/X11R6/lib/X11/fonts/misc",
"/usr/X11R6/lib/X11/fonts/75dpi",
@@ -685,7 +714,11 @@
# list of font directories.
# Then mkfontdir will be called on that directory as well and a correct
# encodings.dir will be generated.
- push (@dirs, ("/usr/X11R6/lib/X11/fonts/encodings"));
+ if (-d "/usr/share/fonts/encodings") {
+ push (@dirs, ("/usr/share/fonts/encodings"));
+ } else {
+ push (@dirs, ("/usr/X11R6/lib/X11/fonts/encodings"));
+ }
# remove non existing directories and duplicates:
my %dirs = ();
@@ -887,6 +920,12 @@
if (-d "/usr/X11R6/lib/X11/fonts/encodings/large") {
$command .= " -e /usr/X11R6/lib/X11/fonts/encodings/large";
}
+ if (-d "/usr/share/fonts/encodings") {
+ $command .= " -e /usr/share/fonts/encodings";
+ }
+ if (-d "/usr/share/fonts/encodings/large") {
+ $command .= " -e /usr/share/fonts/encodings/large";
+ }
$command .= " $dir";
my_system ($command);
}
@@ -1660,9 +1699,15 @@
my $gothic_xlfd = "-misc-sazanami gothic-";
my $gothic_xlfd_no_space = "-misc-sazanami_gothic-";
my $gothic_file = "/usr/X11R6/lib/X11/fonts/truetype/sazanami-gothic.ttf";
+ if (-f "/usr/share/fonts/truetype/sazanami-gothic.ttf" ) {
+ my $gothic_file = "/usr/share/fonts/truetype/sazanami-gothic.ttf";
+ }
my $mincho_xlfd = "-misc-sazanami mincho-";
my $mincho_xlfd_no_space = "-misc-sazanami_mincho-";
my $mincho_file = "/usr/X11R6/lib/X11/fonts/truetype/sazanami-mincho.ttf";
+ if (-f "/usr/share/fonts/truetype/sazanami-mincho.ttf" ) {
+ my $mincho_file = "/usr/share/fonts/truetype/sazanami-mincho.ttf";
+ }
for my $font (@gothic_priority) {
if (`fc-list "$font"`) {
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit-help@opensuse.org