diff --git a/fonts-config b/fonts-config
index af0ae31..580a5fe 100644
--- a/fonts-config
+++ b/fonts-config
@@ -2275,7 +2275,7 @@ sub font_dirs_setup {
}
########################################################################
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 hinting_setup {
########################################################################
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 @@ sub embedded_bitmap_setup {
$suse_bitmaps_template .= " false\n";
$suse_bitmaps_template .= " \n";
$suse_bitmaps_template .= " \n";
- $suse_bitmaps_template .= " \n";
- $suse_bitmaps_template .= " \n";
my @languages = split (":", "$OPT_EBITMAP_LANG");
for my $i (@languages) {
- $suse_bitmaps_template .= " $i\n";
+ $suse_bitmaps_template .= " \n";
+ $suse_bitmaps_template .= " $i\n";
+ $suse_bitmaps_template .= " true\n";
+ $suse_bitmaps_template .= " \n";
}
- $suse_bitmaps_template .= " \n";
- $suse_bitmaps_template .= " \n";
- $suse_bitmaps_template .= " true\n";
- $suse_bitmaps_template .= " \n";
- $suse_bitmaps_template .= " \n";
}
}
}
diff --git a/fonts-config.changes b/fonts-config.changes
index 2343b38..5f3794d 100644
--- a/fonts-config.changes
+++ b/fonts-config.changes
@@ -4,6 +4,11 @@ Mon Sep 17 08:44:38 UTC 2012 - coolo@suse.com
- the script requires checkproc and killproc, otherwise it will start
a xfs in buildroot (oops)
+-------------------------------------------------------------------
+Fri Sep 14 08:00:41 UTC 2012 - pgajdos@suse.com
+
+- cooperate with fontconfig 2.10.0 (removed /etc/fonts/conf.avail)
+
-------------------------------------------------------------------
Tue Aug 28 14:18:59 UTC 2012 - pgajdos@suse.com
diff --git a/fonts-config.spec b/fonts-config.spec
index 88c667f..a71310a 100644
--- a/fonts-config.spec
+++ b/fonts-config.spec
@@ -66,15 +66,16 @@ pod2man --section 1 --center=" " $RPM_SOURCE_DIR/fonts-config > \
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 @@ exit 0
%{_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
diff --git a/suse-hinting.conf.template b/suse-hinting.conf.template
index a583336..b0c09d2 100644
--- a/suse-hinting.conf.template
+++ b/suse-hinting.conf.template
@@ -26,38 +26,131 @@
and like a bitmap look and feel.
-->
-
- Andale Mono
- Arial
- Comic Sans MS
- Georgia
- Impact
- Trebuchet MS
- Verdana
- Courier New
- Times New Roman
- Tahoma
- Webdings
- Albany AMT
- Thorndale AMT
- Cumberland AMT
- Andale Sans
- Andy MT
- Bell MT
- Monotype Sorts
- Lucida Sans Typewriter
- Lucida Sans
- Lucida Bright
-
-
- _BYTECODE_BW_MAX_PIXEL_
-
-
- false
-
-
- false
-
+ Andale Mono
+ _BYTECODE_BW_MAX_PIXEL_
+ false
+ false
+
+
+ Arial
+ _BYTECODE_BW_MAX_PIXEL_
+ false
+ false
+
+
+
+ Comic Sans MS
+ _BYTECODE_BW_MAX_PIXEL_
+ false
+ false
+
+
+ Georgia
+ _BYTECODE_BW_MAX_PIXEL_
+ false
+ false
+
+
+ Impact
+ _BYTECODE_BW_MAX_PIXEL_
+ false
+ false
+
+
+ Trebuchet MS
+ _BYTECODE_BW_MAX_PIXEL_
+ false
+ false
+
+
+ Verdana
+ _BYTECODE_BW_MAX_PIXEL_
+ false
+ false
+
+
+ Courier New
+ _BYTECODE_BW_MAX_PIXEL_
+ false
+ false
+
+
+ Times New Roman
+ _BYTECODE_BW_MAX_PIXEL_
+ false
+ false
+
+
+ Tahoma
+ _BYTECODE_BW_MAX_PIXEL_
+ false
+ false
+
+
+ Webdings
+ _BYTECODE_BW_MAX_PIXEL_
+ false
+ false
+
+
+ Albany AMT
+ _BYTECODE_BW_MAX_PIXEL_
+ false
+ false
+
+
+ Thorndale AMT
+ _BYTECODE_BW_MAX_PIXEL_
+ false
+ false
+
+
+ Cumberland AMT
+ _BYTECODE_BW_MAX_PIXEL_
+ false
+ false
+
+
+ Andale Sans
+ _BYTECODE_BW_MAX_PIXEL_
+ false
+ false
+
+
+ Andy MT
+ _BYTECODE_BW_MAX_PIXEL_
+ false
+ false
+
+
+ Bell MT
+ _BYTECODE_BW_MAX_PIXEL_
+ false
+ false
+
+
+ Monotype Sorts
+ _BYTECODE_BW_MAX_PIXEL_
+ false
+ false
+
+
+ Lucida Sans Typewriter
+ _BYTECODE_BW_MAX_PIXEL_
+ false
+ false
+
+
+ Lucida Sans
+ _BYTECODE_BW_MAX_PIXEL_
+ false
+ false
+
+
+ Lucida Bright
+ _BYTECODE_BW_MAX_PIXEL_
+ false
+ false