diff --git a/suse-hinting.conf b/11-suse-hinting.conf
similarity index 79%
rename from suse-hinting.conf
rename to 11-suse-hinting.conf
index de7e53d..6c24cd5 100644
--- a/suse-hinting.conf
+++ b/11-suse-hinting.conf
@@ -2,10 +2,6 @@
-
-
-
-
@@ -153,6 +149,13 @@
HGPKyokashotai
HGSSoeiKakupoptai
HGSeikaishotaiPRO
+ IPAexMincho
+ IPAexGothic
+ IPAMincho
+ IPAGothic
+ IPAPMincho
+ IPAPGothic
+ IPAUIGothic
TLKyokashotai
TLMincho
TLPMincho
@@ -313,119 +316,4 @@ off the autohinter for the "Likhan" font:
-
-
-
- false
-
-
- hintfull
-
-
-
-
-
- true
-
-
- hintslight
-
-
-
-
-
-
-
-
-
- Liberation Sans
-
-
- hintslight
-
-
-
-
-
- DejaVu Sans
-
-
- hintslight
-
-
-
-
-
- Droid Sans
-
-
- hintslight
-
-
-
-
-
- Liberation Serif
-
-
- hintslight
-
-
-
-
-
- DejaVu Serif
-
-
- hintslight
-
-
-
-
-
- Droid Serif
-
-
- hintslight
-
-
-
-
-
-
-
- Cantarell
-
-
- true
-
-
- hintfull
-
-
-
diff --git a/16-suse-hintstyle.conf b/16-suse-hintstyle.conf
new file mode 100644
index 0000000..b94f716
--- /dev/null
+++ b/16-suse-hintstyle.conf
@@ -0,0 +1,122 @@
+
+
+
+
+
+
+
+
+
+ false
+
+
+ hintfull
+
+
+
+
+
+ true
+
+
+ hintslight
+
+
+
+
+
+
+
+
+
+ Liberation Sans
+
+
+ hintslight
+
+
+
+
+
+ DejaVu Sans
+
+
+ hintslight
+
+
+
+
+
+ Droid Sans
+
+
+ hintslight
+
+
+
+
+
+ Liberation Serif
+
+
+ hintslight
+
+
+
+
+
+ DejaVu Serif
+
+
+ hintslight
+
+
+
+
+
+ Droid Serif
+
+
+ hintslight
+
+
+
+
+
+
+
+ Cantarell
+
+
+ true
+
+
+ hintfull
+
+
+
+
diff --git a/18-suse-bitmaps-misc.conf b/18-suse-bitmaps-misc.conf
new file mode 100644
index 0000000..f57146e
--- /dev/null
+++ b/18-suse-bitmaps-misc.conf
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+
+
+
+
+ IPAMincho
+ IPAGothic
+ IPAPMincho
+ IPAPGothic
+ IPAUIGothic
+ IPAexMincho
+ IPAexGothic
+
+
+ false
+
+
+
+
diff --git a/fontconfig.changes b/fontconfig.changes
index 02f0fcd..164a650 100644
--- a/fontconfig.changes
+++ b/fontconfig.changes
@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Tue Jun 12 10:41:54 CEST 2012 - tiwai@suse.de
+
+- Revisit SUSE-specific config (bnc#766319):
+ * Split suse-hinting.conf to a part defining the default
+ autohint and a part defining the default hintstyle depending on
+ autohint. These are now put in conf.d/11-suse-hinting.conf and
+ 16-suse-hintstyle.conf, so that extra packages may put their
+ own autohint value between them.
+ * Move suse-bitmaps.conf to conf.d, too
+ * Move optional configs modified by fonts-config to fonts-config
+ package itself
+- Set autohint=true for IPA* fonts as well as MS fonts;
+ hintslight will be chosen automatically (bnc#766319)
+- Add missing IPAex* fonts to suse-generic-names.conf lists.
+- Obsolete ipa-fonts-config package as the default configs are now
+ included in this package
+
-------------------------------------------------------------------
Sun Jun 3 22:18:41 UTC+8 2012 - hillwood@linuxfans.org
diff --git a/fontconfig.spec b/fontconfig.spec
index 4547ebc..75a446e 100644
--- a/fontconfig.spec
+++ b/fontconfig.spec
@@ -16,7 +16,6 @@
#
-
Name: fontconfig
%define build_docs 0
BuildRequires: automake
@@ -62,8 +61,9 @@ Source4: baselibs.conf
Source10: suse-generic-names.conf
Source11: suse-pre-user.conf
Source12: suse-post-user.conf
-Source13: suse-hinting.conf
-Source14: suse-bitmaps.conf
+Source13: 11-suse-hinting.conf
+Source14: 16-suse-hintstyle.conf
+Source15: 18-suse-bitmaps-misc.conf
Source16: local.conf
Source20: local.conf.instsys
# fixed in next release https://www.libreoffice.org/bugzilla/show_bug.cgi?id=47703
@@ -76,6 +76,10 @@ Patch2: usr-share-doc-packages.patch
# https://www.libreoffice.org/bugzilla/show_bug.cgi?id=47705
Patch3: cloexec.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Provides: ipa-fonts-config = 003.02
+Obsoletes: ipa-fonts-config <= 003.02
+Provides: IPA-fonts-config = 003.02
+Obsoletes: IPA-fonts-config <= 003.02
%description
Fontconfig is a library for configuring and customizing font access. It
@@ -85,10 +89,10 @@ which accepts font patterns and returns the nearest matching font.
%package devel
Requires: %{name} = %version
-Requires: freetype2-devel glibc-devel
+Requires: freetype2-devel
+Requires: glibc-devel
Provides: XFree86-devel:%_libdir/pkgconfig/fontconfig.pc
Summary: Include Files and Libraries mandatory for Development
-License: MIT
Group: Development/Libraries/C and C++
# bug437293
%ifarch ppc64
@@ -161,6 +165,11 @@ done
# install the conf.d README as well, I think it's helpful:
install -m 644 conf.d/README $RPM_BUILD_ROOT/etc/fonts/conf.d
install -m 644 $RPM_SOURCE_DIR/suse*.conf $RPM_BUILD_ROOT/etc/fonts/
+for i in $RPM_SOURCE_DIR/[0-9]*.conf; do
+ j=${i##*/}
+ install -m 644 $i $RPM_BUILD_ROOT/etc/fonts/conf.avail/
+ ln -s ../conf.avail/$j $RPM_BUILD_ROOT/etc/fonts/conf.d/$j
+done
install -m 644 $RPM_SOURCE_DIR/local.conf $RPM_BUILD_ROOT/etc/fonts
install -m 644 $RPM_SOURCE_DIR/local.conf.instsys $RPM_BUILD_ROOT/etc/fonts/
# tune links in conf.d:
@@ -190,8 +199,6 @@ rm -f %{buildroot}%{_libdir}/*.la
%config /etc/fonts/suse-generic-names.conf
%config /etc/fonts/suse-pre-user.conf
%config /etc/fonts/suse-post-user.conf
-%config %verify(not md5 size mtime) /etc/fonts/suse-hinting.conf
-%config %verify(not md5 size mtime) /etc/fonts/suse-bitmaps.conf
%dir /etc/fonts/conf.avail/
/etc/fonts/conf.avail/*
%dir /etc/fonts/conf.d/
diff --git a/suse-bitmaps.conf b/suse-bitmaps.conf
deleted file mode 100644
index f79c3a2..0000000
--- a/suse-bitmaps.conf
+++ /dev/null
@@ -1,121 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- false
-
-
-
-
- ja
- ko
- zh
-
-
- true
-
-
-
-
-
-
- IPAMincho
- IPAGothic
- IPAPMincho
- IPAPGothic
- IPAUIGothic
-
-
- false
-
-
- false
-
-
-
-
-
diff --git a/suse-generic-names.conf b/suse-generic-names.conf
index 6ebffe5..420be7c 100644
--- a/suse-generic-names.conf
+++ b/suse-generic-names.conf
@@ -26,6 +26,7 @@
HGSMinchoE
IPAMincho
IPAPMincho
+ IPAexMincho
Sazanami Mincho
STIXGeneral
serif
@@ -52,6 +53,7 @@
HGSGothicM
IPAGothic
IPAPGothic
+ IPAexGothic
Sazanami Gothic
Baekmuk Gulim
sans-serif
diff --git a/suse-post-user.conf b/suse-post-user.conf
index f336b82..4762b26 100644
--- a/suse-post-user.conf
+++ b/suse-post-user.conf
@@ -36,6 +36,7 @@
HGMinchoL
IPAPMincho
IPAMincho
+ IPAexMincho
Sazanami Mincho
Kochi Mincho
CMEXSong
@@ -88,6 +89,7 @@
HGGothicB
IPAPGothic
IPAGothic
+ IPAexGothic
VL PGothic
VL Gothic
Sazanami Gothic
diff --git a/suse-pre-user.conf b/suse-pre-user.conf
index 854a661..29bbb25 100644
--- a/suse-pre-user.conf
+++ b/suse-pre-user.conf
@@ -316,18 +316,6 @@
-
-
-
-
- /etc/fonts/suse-hinting.conf
-
-
-
-
-
- /etc/fonts/suse-bitmaps.conf
-