This commit is contained in:
parent
8e6db3212f
commit
5474084432
20
fonts-config
20
fonts-config
@ -205,8 +205,8 @@ use strict;
|
|||||||
|
|
||||||
my $script_start_time = time();
|
my $script_start_time = time();
|
||||||
|
|
||||||
my $cvs_id = '$Id: fonts-config,v 1.68 2006/10/25 13:58:26 mfabian Exp $';
|
my $cvs_id = '$Id: fonts-config,v 1.70 2007/09/25 15:48:02 mfabian Exp $';
|
||||||
my $cvs_date = '$Date: 2006/10/25 13:58:26 $';
|
my $cvs_date = '$Date: 2007/09/25 15:48:02 $';
|
||||||
$cvs_date =~ /^\$[[:alpha:]]+: (.*) \$$/;
|
$cvs_date =~ /^\$[[:alpha:]]+: (.*) \$$/;
|
||||||
my $version = $1;
|
my $version = $1;
|
||||||
|
|
||||||
@ -1824,7 +1824,7 @@ sub generate_java_font_setup {
|
|||||||
while (<NAMES>) {
|
while (<NAMES>) {
|
||||||
chomp $ARG;
|
chomp $ARG;
|
||||||
$ARG =~ s/:.*$//;
|
$ARG =~ s/:.*$//;
|
||||||
if ($ARG =~ /\.ttf|\.ttc/ && -f "$ARG") {
|
if ($ARG =~ /\.ttf|\.ttc/ && -f "$ARG" && ! -l "$ARG") {
|
||||||
$sans_japanese_file = $ARG;
|
$sans_japanese_file = $ARG;
|
||||||
$sans_japanese_xlfd = $sans_japanese_xlfds{"$font"};
|
$sans_japanese_xlfd = $sans_japanese_xlfds{"$font"};
|
||||||
}
|
}
|
||||||
@ -1845,7 +1845,7 @@ sub generate_java_font_setup {
|
|||||||
while (<NAMES>) {
|
while (<NAMES>) {
|
||||||
chomp $ARG;
|
chomp $ARG;
|
||||||
$ARG =~ s/:.*$//;
|
$ARG =~ s/:.*$//;
|
||||||
if ($ARG =~ /\.ttf|\.ttc/ && -f "$ARG") {
|
if ($ARG =~ /\.ttf|\.ttc/ && -f "$ARG" && ! -l "$ARG") {
|
||||||
$serif_japanese_file = $ARG;
|
$serif_japanese_file = $ARG;
|
||||||
$serif_japanese_xlfd = $serif_japanese_xlfds{"$font"};
|
$serif_japanese_xlfd = $serif_japanese_xlfds{"$font"};
|
||||||
}
|
}
|
||||||
@ -1866,7 +1866,7 @@ sub generate_java_font_setup {
|
|||||||
while (<NAMES>) {
|
while (<NAMES>) {
|
||||||
chomp $ARG;
|
chomp $ARG;
|
||||||
$ARG =~ s/:.*$//;
|
$ARG =~ s/:.*$//;
|
||||||
if ($ARG =~ /\.ttf|\.ttc/ && -f "$ARG") {
|
if ($ARG =~ /\.ttf|\.ttc/ && -f "$ARG" && ! -l "$ARG") {
|
||||||
$sans_simplified_chinese_file = $ARG;
|
$sans_simplified_chinese_file = $ARG;
|
||||||
$sans_simplified_chinese_xlfd = $sans_simplified_chinese_xlfds{"$font"};
|
$sans_simplified_chinese_xlfd = $sans_simplified_chinese_xlfds{"$font"};
|
||||||
}
|
}
|
||||||
@ -1887,7 +1887,7 @@ sub generate_java_font_setup {
|
|||||||
while (<NAMES>) {
|
while (<NAMES>) {
|
||||||
chomp $ARG;
|
chomp $ARG;
|
||||||
$ARG =~ s/:.*$//;
|
$ARG =~ s/:.*$//;
|
||||||
if ($ARG =~ /\.ttf|\.ttc/ && -f "$ARG") {
|
if ($ARG =~ /\.ttf|\.ttc/ && -f "$ARG" && ! -l "$ARG") {
|
||||||
$serif_simplified_chinese_file = $ARG;
|
$serif_simplified_chinese_file = $ARG;
|
||||||
$serif_simplified_chinese_xlfd = $serif_simplified_chinese_xlfds{"$font"};
|
$serif_simplified_chinese_xlfd = $serif_simplified_chinese_xlfds{"$font"};
|
||||||
}
|
}
|
||||||
@ -1908,7 +1908,7 @@ sub generate_java_font_setup {
|
|||||||
while (<NAMES>) {
|
while (<NAMES>) {
|
||||||
chomp $ARG;
|
chomp $ARG;
|
||||||
$ARG =~ s/:.*$//;
|
$ARG =~ s/:.*$//;
|
||||||
if ($ARG =~ /\.ttf|\.ttc/ && -f "$ARG") {
|
if ($ARG =~ /\.ttf|\.ttc/ && -f "$ARG" && ! -l "$ARG") {
|
||||||
$sans_traditional_chinese_file = $ARG;
|
$sans_traditional_chinese_file = $ARG;
|
||||||
$sans_traditional_chinese_xlfd = $sans_traditional_chinese_xlfds{"$font"};
|
$sans_traditional_chinese_xlfd = $sans_traditional_chinese_xlfds{"$font"};
|
||||||
}
|
}
|
||||||
@ -1929,7 +1929,7 @@ sub generate_java_font_setup {
|
|||||||
while (<NAMES>) {
|
while (<NAMES>) {
|
||||||
chomp $ARG;
|
chomp $ARG;
|
||||||
$ARG =~ s/:.*$//;
|
$ARG =~ s/:.*$//;
|
||||||
if ($ARG =~ /\.ttf|\.ttc/ && -f "$ARG") {
|
if ($ARG =~ /\.ttf|\.ttc/ && -f "$ARG" && ! -l "$ARG") {
|
||||||
$serif_traditional_chinese_file = $ARG;
|
$serif_traditional_chinese_file = $ARG;
|
||||||
$serif_traditional_chinese_xlfd = $serif_traditional_chinese_xlfds{"$font"};
|
$serif_traditional_chinese_xlfd = $serif_traditional_chinese_xlfds{"$font"};
|
||||||
}
|
}
|
||||||
@ -1950,7 +1950,7 @@ sub generate_java_font_setup {
|
|||||||
while (<NAMES>) {
|
while (<NAMES>) {
|
||||||
chomp $ARG;
|
chomp $ARG;
|
||||||
$ARG =~ s/:.*$//;
|
$ARG =~ s/:.*$//;
|
||||||
if ($ARG =~ /\.ttf|\.ttc/ && -f "$ARG") {
|
if ($ARG =~ /\.ttf|\.ttc/ && -f "$ARG" && ! -l "$ARG") {
|
||||||
$sans_korean_file = $ARG;
|
$sans_korean_file = $ARG;
|
||||||
$sans_korean_xlfd = $sans_korean_xlfds{"$font"};
|
$sans_korean_xlfd = $sans_korean_xlfds{"$font"};
|
||||||
}
|
}
|
||||||
@ -1971,7 +1971,7 @@ sub generate_java_font_setup {
|
|||||||
while (<NAMES>) {
|
while (<NAMES>) {
|
||||||
chomp $ARG;
|
chomp $ARG;
|
||||||
$ARG =~ s/:.*$//;
|
$ARG =~ s/:.*$//;
|
||||||
if ($ARG =~ /\.ttf|\.ttc/ && -f "$ARG") {
|
if ($ARG =~ /\.ttf|\.ttc/ && -f "$ARG" && ! -l "$ARG") {
|
||||||
$serif_korean_file = $ARG;
|
$serif_korean_file = $ARG;
|
||||||
$serif_korean_xlfd = $serif_korean_xlfds{"$font"};
|
$serif_korean_xlfd = $serif_korean_xlfds{"$font"};
|
||||||
}
|
}
|
||||||
|
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Sep 25 17:28:18 CEST 2007 - mfabian@suse.de
|
||||||
|
|
||||||
|
- Bugzilla #327035: Skip symlinks when searching for font file
|
||||||
|
names when generating the Java font setup.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Sep 06 13:51:39 CEST 2007 - mfabian@suse.de
|
Thu Sep 06 13:51:39 CEST 2007 - mfabian@suse.de
|
||||||
|
|
||||||
|
@ -14,14 +14,14 @@ Name: fonts-config
|
|||||||
License: GPL v2 or later
|
License: GPL v2 or later
|
||||||
Group: System/X11/Fonts
|
Group: System/X11/Fonts
|
||||||
Provides: xf86tools:/usr/sbin/fonts-config
|
Provides: xf86tools:/usr/sbin/fonts-config
|
||||||
Autoreqprov: on
|
AutoReqProv: on
|
||||||
Requires: fontconfig >= 2.3.93.20060103
|
Requires: fontconfig >= 2.3.93.20060103
|
||||||
%if %suse_version > 1000
|
%if %suse_version > 1000
|
||||||
Recommends: ft2demos
|
Recommends: ft2demos
|
||||||
%endif
|
%endif
|
||||||
Prereq: %fillup_prereq
|
PreReq: %fillup_prereq
|
||||||
Version: 20061025
|
Version: 20061025
|
||||||
Release: 52
|
Release: 58
|
||||||
Summary: Configures Fonts for X Windows and other applications
|
Summary: Configures Fonts for X Windows and other applications
|
||||||
Source: fonts-config
|
Source: fonts-config
|
||||||
Source1: SuSEconfig.fonts
|
Source1: SuSEconfig.fonts
|
||||||
@ -32,7 +32,7 @@ Source5: fontconfig.SuSE.properties.template
|
|||||||
Source6: suse-hinting.conf.template
|
Source6: suse-hinting.conf.template
|
||||||
Source7: suse-bitmaps.conf.template
|
Source7: suse-bitmaps.conf.template
|
||||||
Source8: suse-font-dirs.conf.template
|
Source8: suse-font-dirs.conf.template
|
||||||
BuildArchitectures: noarch
|
BuildArch: noarch
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -79,8 +79,10 @@ exit 0
|
|||||||
/sbin/conf.d/SuSEconfig.fonts
|
/sbin/conf.d/SuSEconfig.fonts
|
||||||
%{_mandir}/man1/fonts-config.1.gz
|
%{_mandir}/man1/fonts-config.1.gz
|
||||||
/var/adm/fillup-templates/sysconfig.fonts-config
|
/var/adm/fillup-templates/sysconfig.fonts-config
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* 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
|
* Thu Sep 06 2007 - mfabian@suse.de
|
||||||
- Bugzilla #299432: add ‘Prereq: %%fillup_prereq’.
|
- Bugzilla #299432: add ‘Prereq: %%fillup_prereq’.
|
||||||
* Fri Mar 23 2007 - mfabian@suse.de
|
* Fri Mar 23 2007 - mfabian@suse.de
|
||||||
|
Loading…
x
Reference in New Issue
Block a user