Hello community,
here is the log from the commit of package fonts-config for openSUSE:Factory checked in at 2012-10-03 07:13:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/fonts-config (Old)
and /work/SRC/openSUSE:Factory/.fonts-config.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fonts-config", Maintainer is "PGajdos@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/fonts-config/fonts-config.changes 2012-09-20 16:00:23.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.fonts-config.new/fonts-config.changes 2012-10-03 07:13:38.000000000 +0200
@@ -7,0 +8,5 @@
+Fri Sep 14 08:00:41 UTC 2012 - pgajdos@suse.com
+
+- cooperate with fontconfig 2.10.0 (removed /etc/fonts/conf.avail)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ fonts-config.spec ++++++
--- /var/tmp/diff_new_pack.5cbQEJ/_old 2012-10-03 07:13:40.000000000 +0200
+++ /var/tmp/diff_new_pack.5cbQEJ/_new 2012-10-03 07:13:40.000000000 +0200
@@ -66,15 +66,16 @@
install -m 644 $RPM_SOURCE_DIR/sysconfig.fonts-config \
%{buildroot}%{_localstatedir}/adm/fillup-templates/
#
-mkdir -p %{buildroot}%{_fontsconfddir}
-mkdir -p %{buildroot}%{_fontsconfavaildir}
+mkdir %{buildroot}%{_datadir}/%{name}/conf.avail/
sed -e's/_BYTECODE_BW_MAX_PIXEL_/0/' %{SOURCE6} \
- > %{buildroot}%{_fontsconfavaildir}/12-suse-hinting-bc.conf
+ > %{buildroot}%{_datadir}/%{name}/conf.avail/12-suse-hinting-bc.conf
sed -e's/_USE_EMBEDDED_BITMAPS_PLACEHOLDER_//' %{SOURCE7} \
- > %{buildroot}%{_fontsconfavaildir}/17-suse-bitmaps.conf
-ln -s ../conf.avail/12-suse-hinting-bc.conf \
+ > %{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 ../conf.avail/17-suse-bitmaps.conf \
+ln -s %{_datadir}/%{name}/conf.avail/17-suse-bitmaps.conf \
%{buildroot}%{_fontsconfddir}/17-suse-bitmaps.conf
%post
@@ -89,7 +90,8 @@
%{_datadir}/fonts-config/*
%{_mandir}/man1/fonts-config.1.gz
%{_localstatedir}/adm/fillup-templates/sysconfig.fonts-config
-%{_fontsconfavaildir}/*
+%dir %{_datadir}/%{name}/conf.avail
+%{_datadir}/%{name}/conf.avail/*.conf
%{_fontsconfddir}/*
%changelog
++++++ fonts-config ++++++
--- /var/tmp/diff_new_pack.5cbQEJ/_old 2012-10-03 07:13:40.000000000 +0200
+++ /var/tmp/diff_new_pack.5cbQEJ/_new 2012-10-03 07:13:40.000000000 +0200
@@ -2275,7 +2275,7 @@
}
########################################################################
sub hinting_setup {
- my $suse_hinting_file = "/etc/fonts/conf.avail/12-suse-hinting-bc.conf";
+ my $suse_hinting_file = "/usr/share/fonts-config/conf.avail/12-suse-hinting-bc.conf";
my $suse_hinting_template_file = "/usr/share/fonts-config/suse-hinting.conf.template";
my $suse_hinting = "";
my $suse_hinting_template = "";
@@ -2311,7 +2311,7 @@
########################################################################
sub embedded_bitmap_setup {
- my $suse_bitmaps_file = "/etc/fonts/conf.avail/17-suse-bitmaps.conf";
+ my $suse_bitmaps_file = "/usr/share/fonts-config/conf.avail/17-suse-bitmaps.conf";
my $suse_bitmaps_template_file = "/usr/share/fonts-config/suse-bitmaps.conf.template";
my $suse_bitmaps = "";
my $suse_bitmaps_template = "";
@@ -2342,17 +2342,13 @@
$suse_bitmaps_template .= " <bool>false</bool>\n";
$suse_bitmaps_template .= " </edit>\n";
$suse_bitmaps_template .= " </match>\n";
- $suse_bitmaps_template .= " \n";
- $suse_bitmaps_template .= " \n";
my @languages = split (":", "$OPT_EBITMAP_LANG");
for my $i (@languages) {
- $suse_bitmaps_template .= " <string>$i</string>\n";
+ $suse_bitmaps_template .= " \n";
+ $suse_bitmaps_template .= " <string>$i</string></test>\n";
+ $suse_bitmaps_template .= " <bool>true</bool></edit>\n";
+ $suse_bitmaps_template .= " </match>\n";
}
- $suse_bitmaps_template .= " </test>\n";
- $suse_bitmaps_template .= " \n";
- $suse_bitmaps_template .= " <bool>true</bool>\n";
- $suse_bitmaps_template .= " </edit>\n";
- $suse_bitmaps_template .= " </match>\n";
}
}
}
++++++ suse-hinting.conf.template ++++++
--- /var/tmp/diff_new_pack.5cbQEJ/_old 2012-10-03 07:13:40.000000000 +0200
+++ /var/tmp/diff_new_pack.5cbQEJ/_new 2012-10-03 07:13:40.000000000 +0200
@@ -26,38 +26,131 @@
and like a bitmap look and feel.
-->
<match target="font">
- <test name="family">
- <string>Andale Mono</string>
- <string>Arial</string>
- <string>Comic Sans MS</string>
- <string>Georgia</string>
- <string>Impact</string>
- <string>Trebuchet MS</string>
- <string>Verdana</string>
- <string>Courier New</string>
- <string>Times New Roman</string>
- <string>Tahoma</string>
- <string>Webdings</string>
- <string>Albany AMT</string>
- <string>Thorndale AMT</string>
- <string>Cumberland AMT</string>
- <string>Andale Sans</string>
- <string>Andy MT</string>
- <string>Bell MT</string>
- <string>Monotype Sorts</string>
- <string>Lucida Sans Typewriter</string>
- <string>Lucida Sans</string>
- <string>Lucida Bright</string>
- </test>
- <test name="pixelsize" compare="less_eq">
- <double>_BYTECODE_BW_MAX_PIXEL_</double>
- </test>
- <edit name="autohint">
- <bool>false</bool>
- </edit>
- <edit name="antialias">
- <bool>false</bool>
- </edit>
+ <test name="family"><string>Andale Mono</string></test>
+ <test name="pixelsize" compare="less_eq"><double>_BYTECODE_BW_MAX_PIXEL_</double></test>
+ <edit name="autohint"><bool>false</bool></edit>
+ <edit name="antialias"><bool>false</bool></edit>
+ </match>
+ <match target="font">
+ <test name="family"><string>Arial</string></test>
+ <test name="pixelsize" compare="less_eq"><double>_BYTECODE_BW_MAX_PIXEL_</double></test>
+ <edit name="autohint"><bool>false</bool></edit>
+ <edit name="antialias"><bool>false</bool></edit>
+ </match>
+
+ <match target="font">
+ <test name="family"><string>Comic Sans MS</string></test>
+ <test name="pixelsize" compare="less_eq"><double>_BYTECODE_BW_MAX_PIXEL_</double></test>
+ <edit name="autohint"><bool>false</bool></edit>
+ <edit name="antialias"><bool>false</bool></edit>
+ </match>
+ <match target="font">
+ <test name="family"><string>Georgia</string></test>
+ <test name="pixelsize" compare="less_eq"><double>_BYTECODE_BW_MAX_PIXEL_</double></test>
+ <edit name="autohint"><bool>false</bool></edit>
+ <edit name="antialias"><bool>false</bool></edit>
+ </match>
+ <match target="font">
+ <test name="family"><string>Impact</string></test>
+ <test name="pixelsize" compare="less_eq"><double>_BYTECODE_BW_MAX_PIXEL_</double></test>
+ <edit name="autohint"><bool>false</bool></edit>
+ <edit name="antialias"><bool>false</bool></edit>
+ </match>
+ <match target="font">
+ <test name="family"><string>Trebuchet MS</string></test>
+ <test name="pixelsize" compare="less_eq"><double>_BYTECODE_BW_MAX_PIXEL_</double></test>
+ <edit name="autohint"><bool>false</bool></edit>
+ <edit name="antialias"><bool>false</bool></edit>
+ </match>
+ <match target="font">
+ <test name="family"><string>Verdana</string></test>
+ <test name="pixelsize" compare="less_eq"><double>_BYTECODE_BW_MAX_PIXEL_</double></test>
+ <edit name="autohint"><bool>false</bool></edit>
+ <edit name="antialias"><bool>false</bool></edit>
+ </match>
+ <match target="font">
+ <test name="family"><string>Courier New</string></test>
+ <test name="pixelsize" compare="less_eq"><double>_BYTECODE_BW_MAX_PIXEL_</double></test>
+ <edit name="autohint"><bool>false</bool></edit>
+ <edit name="antialias"><bool>false</bool></edit>
+ </match>
+ <match target="font">
+ <test name="family"><string>Times New Roman</string></test>
+ <test name="pixelsize" compare="less_eq"><double>_BYTECODE_BW_MAX_PIXEL_</double></test>
+ <edit name="autohint"><bool>false</bool></edit>
+ <edit name="antialias"><bool>false</bool></edit>
+ </match>
+ <match target="font">
+ <test name="family"><string>Tahoma</string></test>
+ <test name="pixelsize" compare="less_eq"><double>_BYTECODE_BW_MAX_PIXEL_</double></test>
+ <edit name="autohint"><bool>false</bool></edit>
+ <edit name="antialias"><bool>false</bool></edit>
+ </match>
+ <match target="font">
+ <test name="family"><string>Webdings</string></test>
+ <test name="pixelsize" compare="less_eq"><double>_BYTECODE_BW_MAX_PIXEL_</double></test>
+ <edit name="autohint"><bool>false</bool></edit>
+ <edit name="antialias"><bool>false</bool></edit>
+ </match>
+ <match target="font">
+ <test name="family"><string>Albany AMT</string></test>
+ <test name="pixelsize" compare="less_eq"><double>_BYTECODE_BW_MAX_PIXEL_</double></test>
+ <edit name="autohint"><bool>false</bool></edit>
+ <edit name="antialias"><bool>false</bool></edit>
+ </match>
+ <match target="font">
+ <test name="family"><string>Thorndale AMT</string></test>
+ <test name="pixelsize" compare="less_eq"><double>_BYTECODE_BW_MAX_PIXEL_</double></test>
+ <edit name="autohint"><bool>false</bool></edit>
+ <edit name="antialias"><bool>false</bool></edit>
+ </match>
+ <match target="font">
+ <test name="family"><string>Cumberland AMT</string></test>
+ <test name="pixelsize" compare="less_eq"><double>_BYTECODE_BW_MAX_PIXEL_</double></test>
+ <edit name="autohint"><bool>false</bool></edit>
+ <edit name="antialias"><bool>false</bool></edit>
+ </match>
+ <match target="font">
+ <test name="family"><string>Andale Sans</string></test>
+ <test name="pixelsize" compare="less_eq"><double>_BYTECODE_BW_MAX_PIXEL_</double></test>
+ <edit name="autohint"><bool>false</bool></edit>
+ <edit name="antialias"><bool>false</bool></edit>
+ </match>
+ <match target="font">
+ <test name="family"><string>Andy MT</string></test>
+ <test name="pixelsize" compare="less_eq"><double>_BYTECODE_BW_MAX_PIXEL_</double></test>
+ <edit name="autohint"><bool>false</bool></edit>
+ <edit name="antialias"><bool>false</bool></edit>
+ </match>
+ <match target="font">
+ <test name="family"><string>Bell MT</string></test>
+ <test name="pixelsize" compare="less_eq"><double>_BYTECODE_BW_MAX_PIXEL_</double></test>
+ <edit name="autohint"><bool>false</bool></edit>
+ <edit name="antialias"><bool>false</bool></edit>
+ </match>
+ <match target="font">
+ <test name="family"><string>Monotype Sorts</string></test>
+ <test name="pixelsize" compare="less_eq"><double>_BYTECODE_BW_MAX_PIXEL_</double></test>
+ <edit name="autohint"><bool>false</bool></edit>
+ <edit name="antialias"><bool>false</bool></edit>
+ </match>
+ <match target="font">
+ <test name="family"><string>Lucida Sans Typewriter</string></test>
+ <test name="pixelsize" compare="less_eq"><double>_BYTECODE_BW_MAX_PIXEL_</double></test>
+ <edit name="autohint"><bool>false</bool></edit>
+ <edit name="antialias"><bool>false</bool></edit>
+ </match>
+ <match target="font">
+ <test name="family"><string>Lucida Sans</string></test>
+ <test name="pixelsize" compare="less_eq"><double>_BYTECODE_BW_MAX_PIXEL_</double></test>
+ <edit name="autohint"><bool>false</bool></edit>
+ <edit name="antialias"><bool>false</bool></edit>
+ </match>
+ <match target="font">
+ <test name="family"><string>Lucida Bright</string></test>
+ <test name="pixelsize" compare="less_eq"><double>_BYTECODE_BW_MAX_PIXEL_</double></test>
+ <edit name="autohint"><bool>false</bool></edit>
+ <edit name="antialias"><bool>false</bool></edit>
</match>
</fontconfig>
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org