SHA256
1
0
forked from pool/fonts-config

Accepting request 220364 from home:pgajdos

- fonts-config 20131102 [bnc#860097]:
  * do not check for font module used -> fixes TTCap entries 
    generation
  * drop generating ghostscript fontmap
  * drop generating ooo xcu file
  * --quiet means quiet now

OBS-URL: https://build.opensuse.org/request/show/220364
OBS-URL: https://build.opensuse.org/package/show/M17N/fonts-config?expand=0&rev=36
This commit is contained in:
2014-01-30 13:46:44 +00:00
committed by Git OBS Bridge
parent 940a385af7
commit 4fb81b60dc
8 changed files with 972 additions and 2075 deletions

View File

@@ -1,53 +0,0 @@
<node oor:name="Font">
<node oor:name="Substitution">
<prop oor:name="Replacement" oor:type="xs:boolean">
<value>true</value>
</prop>
<node oor:name="FontPairs">
<node oor:name="_0" oor:op="replace">
<prop oor:name="Always" oor:type="xs:boolean">
<value>true</value>
</prop>
<prop oor:name="ReplaceFont" oor:type="xs:string">
<value> ゴシック</value>
</prop>
<prop oor:name="SubstituteFont" oor:type="xs:string">
<value>_MSGOTHIC_</value>
</prop>
</node>
<node oor:name="_1" oor:op="replace">
<prop oor:name="Always" oor:type="xs:boolean">
<value>true</value>
</prop>
<prop oor:name="ReplaceFont" oor:type="xs:string">
<value> 明朝</value>
</prop>
<prop oor:name="SubstituteFont" oor:type="xs:string">
<value>_MSMINCHO_</value>
</prop>
</node>
<node oor:name="_2" oor:op="replace">
<prop oor:name="Always" oor:type="xs:boolean">
<value>true</value>
</prop>
<prop oor:name="ReplaceFont" oor:type="xs:string">
<value> Pゴシック</value>
</prop>
<prop oor:name="SubstituteFont" oor:type="xs:string">
<value>_MSPGOTHIC_</value>
</prop>
</node>
<node oor:name="_3" oor:op="replace">
<prop oor:name="Always" oor:type="xs:boolean">
<value>true</value>
</prop>
<prop oor:name="ReplaceFont" oor:type="xs:string">
<value> P明朝</value>
</prop>
<prop oor:name="SubstituteFont" oor:type="xs:string">
<value>_MSPMINCHO_</value>
</prop>
</node>
</node>
</node>
</node>

View File

@@ -3,7 +3,7 @@
#
#
# generated by /usr/sbin/fonts-config (called by "SuSEconfig --module fonts").
# generated by /usr/sbin/fonts-config
#
# Version

File diff suppressed because it is too large Load Diff

View File

@@ -1,3 +1,13 @@
-------------------------------------------------------------------
Thu Jan 30 12:38:10 UTC 2014 - pgajdos@suse.com
- fonts-config 20131102 [bnc#860097]:
* do not check for font module used -> fixes TTCap entries
generation
* drop generating ghostscript fontmap
* drop generating ooo xcu file
* --quiet means quiet now
-------------------------------------------------------------------
Tue Oct 1 11:17:00 UTC 2013 - pgajdos@suse.com

View File

@@ -1,7 +1,7 @@
#
# spec file for package fonts-config
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2014 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
@@ -17,37 +17,34 @@
Name: fonts-config
Version: 20080121
Version: 20131102
Release: 0
Summary: Configures Fonts for X Windows and other applications
License: GPL-2.0+
Group: System/X11/Fonts
Source: fonts-config
Source2: sysconfig.fonts-config
Source3: Common.xcu.template
Source5: fontconfig.SuSE.properties.template
Source6: suse-hinting.conf.template
Source7: suse-bitmaps.conf.template
Source8: suse-font-dirs.conf.template
Source0: fonts-config
Source1: sysconfig.fonts-config
Source2: fontconfig.SuSE.properties.template
Source3: suse-hinting.conf.template
Source4: suse-bitmaps.conf.template
BuildRequires: fontconfig
BuildRequires: fontpackages-devel
Requires(pre): %fillup_prereq
Requires(pre): sysvinit-tools
Requires: fontconfig >= 2.3.93.20060103
%reconfigure_fonts_prereq
Requires: fontconfig
Requires: perl(English)
Recommends: ft2demos
Provides: xf86tools:/usr/sbin/fonts-config
Recommends: mkfontscale
Recommends: mkfontdir
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%reconfigure_fonts_prereq
%description
Configures Fonts for X Windows and other applications.
Usually fonts-config is called automatically via SuSEconfig (SuSEconfig
--module fonts), which is usually automatically called by YaST2. You
can also execute fonts-config directly, which is mainly useful for
debugging it.
Usually fonts-config is called automatically when package containing
font is installed, upgraded or removed. But you can also execute
fonts-config directly, which is mainly useful to debug it (use
--debug flag).
%prep
@@ -59,39 +56,42 @@ mkdir -p %{buildroot}%{_prefix}/sbin
mkdir -p %{buildroot}%{_datadir}/fonts-config
mkdir -p %{buildroot}/%{_mandir}/man1
mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates
install -m 755 $RPM_SOURCE_DIR/fonts-config %{buildroot}%{_prefix}/sbin
install -m 644 $RPM_SOURCE_DIR/*.template %{buildroot}%{_datadir}/fonts-config
pod2man --section 1 --center=" " $RPM_SOURCE_DIR/fonts-config > \
install -m 755 %{SOURCE0} %{buildroot}%{_prefix}/sbin
install -m 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{buildroot}%{_datadir}/fonts-config
pod2man --section 1 --center=" " %{SOURCE0} > \
%{buildroot}/%{_mandir}/man1/fonts-config.1
install -m 644 $RPM_SOURCE_DIR/sysconfig.fonts-config \
install -m 644 %{SOURCE1} \
%{buildroot}%{_localstatedir}/adm/fillup-templates/
#
mkdir %{buildroot}%{_datadir}/%{name}/conf.avail/
sed -e's/_BYTECODE_BW_MAX_PIXEL_/0/' %{SOURCE6} \
sed -e's/_BYTECODE_BW_MAX_PIXEL_/0/' %{SOURCE3} \
> %{buildroot}%{_datadir}/%{name}/conf.avail/12-suse-hinting-bc.conf
sed -e's/_USE_EMBEDDED_BITMAPS_PLACEHOLDER_//' %{SOURCE7} \
sed -e's/_USE_EMBEDDED_BITMAPS_PLACEHOLDER_//' %{SOURCE4} \
> %{buildroot}%{_datadir}/%{name}/conf.avail/17-suse-bitmaps.conf
#
mkdir -p %{buildroot}%{_fontsconfddir}
ln -s %{_datadir}/%{name}/conf.avail/12-suse-hinting-bc.conf \
%{buildroot}%{_fontsconfddir}/12-suse-hinting-bc.conf
ln -s %{_datadir}/%{name}/conf.avail/17-suse-bitmaps.conf \
%{buildroot}%{_fontsconfddir}/17-suse-bitmaps.conf
%link_avail_to_system_fontsconf 12-suse-hinting-bc.conf
%link_avail_to_system_fontsconf 17-suse-bitmaps.conf
%post
%{fillup_only -n fonts-config}
%reconfigure_fonts_post
%reconfigure_fonts_post -c
exit 0
%postun
%reconfigure_fonts_postun -c
%posttrans
%reconfigure_fonts_posttrans
%files
%defattr(-,root,root)
%dir %{_datadir}/fonts-config
%files_fontsconf_availdir
%{_sbindir}/fonts-config
%dir %{_datadir}/fonts-config/
%{_datadir}/fonts-config/*
%{_datadir}/fonts-config/*.template
%{_mandir}/man1/fonts-config.1.gz
%{_localstatedir}/adm/fillup-templates/sysconfig.fonts-config
%dir %{_datadir}/%{name}/conf.avail
%{_datadir}/%{name}/conf.avail/*.conf
%{_fontsconfddir}/*
%files_fontsconf_file -l 12-suse-hinting-bc.conf
%files_fontsconf_file -l 17-suse-bitmaps.conf
%changelog

View File

@@ -1,29 +0,0 @@
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<!-- Generated by SuSEconfig.fonts, don't edit, your changes will get lost. -->
<!-- ************************************************************ -->
<!-- list of font directories -->
<!-- -->
<!-- generated by SuSEconfig.fonts from the template -->
<!-- /usr/share/fonts-config/suse-font-dirs.conf.template -->
<!-- All glob patterns in this template-file are expanded and -->
<!-- all subdirectories of these directories are added as well -->
<!-- ************************************************************ -->
<dir>/usr/share/fonts</dir>
<dir>/usr/X11R6/lib/X11/fonts</dir>
<dir>/opt/kde*/share/fonts</dir>
<dir>/usr/lib/ooo-*/share/fonts</dir>
<dir>/usr/lib64/ooo-*/share/fonts</dir>
<dir>/opt/OpenOffice.org/share/fonts</dir>
<dir>/opt/staroffice*/share/fonts</dir>
<dir>/usr/lib*/jvm/java-*-sun-*/jre/lib/fonts</dir>
<dir>/usr/X11R6/lib/Acrobat*/Resource/*Font</dir>
<dir>/usr/lib/Acrobat*/Resource/*Font</dir>
<dir>/usr/lib/Adobe/*/Resource/*Font</dir>
<dir>/usr/local/share/fonts</dir>
</fontconfig>

View File

@@ -20,7 +20,7 @@
disables this rule by default because most users don't like
that bitmap look and feel.
If you like a bitmap look and feel of your desktop,
copy this rule into your ~/.fonts.conf file and replace the '0'
edit BYTECODE_BW_MAX_PIXEL sysconfig variable - replace '0'
with non-zero pixelsize limit. Using '18' as the pixelsize
limit is a good choice if you have the fonts in this list installed
and like a bitmap look and feel.

View File

@@ -1,3 +1,12 @@
## Path: Desktop
## Description: Display font configuration
## Type: integer
## Default: quiet
#
# type of output (quiet=0, verbose=1, debug=256)
#
VERBOSITY="0"
## Path: Desktop
## Description: Display font configuration
## Type: yesno
@@ -8,26 +17,6 @@
#
GENERATE_TTCAP_ENTRIES="yes"
## Path: System/Printing
## Description: Printer font configuration
## Type: yesno
## Default: no
#
# generate fontmaps for ghostscript
#
# (needs 'ftdump' from the 'ft2demos' package).
#
GENERATE_GHOSTSCRIPT_FONTMAPS="no"
## Path: Desktop
## Description: Display font configuration
## Type: yesno
## Default: yes
#
# generate font setup for OpenOffice
#
GENERATE_OOO_FONT_SETUP="yes"
## Path: Desktop
## Description: Display font configuration
## Type: yesno