diff --git a/fontconfig.changes b/fontconfig.changes
index 7d6c5bb..57c2ffd 100644
--- a/fontconfig.changes
+++ b/fontconfig.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Oct 29 18:56:15 CET 2008 - mfabian@suse.de
+
+- bnc#433591: make "Lohit Oriya" the default font for Oriya. See
+ also:
+ https://bugzilla.mozilla.org/show_bug.cgi?id=461155
+- change /usr/share/doc/fontconfig to /usr/share/doc/packages/fontconfig
+ in the documentation (man-pages and sgml).
+
-------------------------------------------------------------------
Tue Sep 23 13:27:10 CEST 2008 - mfabian@suse.de
diff --git a/fontconfig.spec b/fontconfig.spec
index eb45100..001cbbd 100644
--- a/fontconfig.spec
+++ b/fontconfig.spec
@@ -31,7 +31,7 @@ Url: http://fontconfig.org/
AutoReqProv: on
Requires: bash
Version: 2.6.0
-Release: 4
+Release: 5
Summary: Library for Font Configuration
# CVS can be found here: (CVS is gone, fontconfig uses git now).
# $ cvs -d :pserver:anoncvs@pdx.freedesktop.org:/cvs/fontconfig login
@@ -72,6 +72,7 @@ Patch28: bugzilla-158573-turn-off-hinting-when-embolden.patch
Patch29: fix-build-for-10.0.patch
Patch30: bugzilla-179457-fix-font-file-names-for-wine.patch
Patch31: bugzilla-246783-do-not-crash-when-config-files-contain-broken-stuff.patch
+Patch32: usr-share-doc-packages.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -134,6 +135,7 @@ Authors:
#%patch29 -p1
#%patch30 -p1
%patch31 -p1
+%patch32 -p1
%build
%configure --with-pic \
@@ -246,6 +248,12 @@ rm -rf $RPM_BUILD_ROOT
%{_includedir}/fontconfig/
%changelog
+* Wed Oct 29 2008 mfabian@suse.de
+- bnc#433591: make "Lohit Oriya" the default font for Oriya. See
+ also:
+ https://bugzilla.mozilla.org/show_bug.cgi?id=461155
+- change /usr/share/doc/fontconfig to /usr/share/doc/packages/fontconfig
+ in the documentation (man-pages and sgml).
* Tue Sep 23 2008 mfabian@suse.de
- kill "la" files and static libraries *only* for versions >
openSUSE 11.0.
@@ -456,7 +464,7 @@ rm -rf $RPM_BUILD_ROOT
- update to 2.3.93.20060214:
- patch to ignore broken bitmap fonts included upstream.
- memory leaks in error conditon code fixed.
-* Tue Feb 14 2006 mfabian@suse.de
+* Mon Feb 13 2006 mfabian@suse.de
- Bugzilla #150552: ignore broken bitmap fonts which don't even
have a BDF property FAMILY_NAME.
* Mon Feb 13 2006 mfabian@suse.de
@@ -602,7 +610,7 @@ rm -rf $RPM_BUILD_ROOT
add an cheap method to add subdirectories to the list of
font directories to avoid having to call the expensive
FcInitLoadConfigAndFonts () function.
-* Sat Jan 21 2006 mfabian@suse.de
+* Fri Jan 20 2006 mfabian@suse.de
- add improve-normalization-of-font-path.patch.
* Fri Jan 20 2006 mfabian@suse.de
- update to 2.3.93.20060120.
@@ -780,7 +788,7 @@ rm -rf $RPM_BUILD_ROOT
* Sat Aug 20 2005 mfabian@suse.de
- Bugzilla #105990: switch on embedded bitmaps again during
the installation.
-* Sat Aug 20 2005 mfabian@suse.de
+* Fri Aug 19 2005 mfabian@suse.de
- Bugzilla #105626: work around the loss of rendering quality
for the IPA fonts caused by the update to freetype 2.1.10 by
switching off the hinting for the IPA fonts.
@@ -939,7 +947,7 @@ rm -rf $RPM_BUILD_ROOT
- fix from upstream CVS: (src/fcfreetype.c):
* Fixed bug in using available_sizes[i].height which
is in pixels, not 64ths of a pixel.
-* Sun Apr 04 2004 mfabian@suse.de
+* Sat Apr 03 2004 mfabian@suse.de
- Bugzilla #38204 comment #5:
"Fix some issue in the default alias list": SimSun is a serif
font, it should not ge in the generics sans-serif list.
@@ -1052,7 +1060,7 @@ rm -rf $RPM_BUILD_ROOT
- added FZSongTi to serif, sans-serif and monospace family aliases
* Wed May 28 2003 mfabian@suse.de
- install fc-list and fc-cache man pages.
-* Mon May 19 2003 mfabian@suse.de
+* Sun May 18 2003 mfabian@suse.de
- fontconfig-ta.orth-cvs.patch: Remove 0b82 and Tamil numbers from
tamil orthography (from upstream cvs)
- add Tamil fonts to "prefer" aliases
diff --git a/suse-post-user.conf b/suse-post-user.conf
index c9d54da..4ea95a9 100644
--- a/suse-post-user.conf
+++ b/suse-post-user.conf
@@ -23,6 +23,7 @@
Times
Khmer OS System
Lohit Punjabi
+ Lohit Oriya
Pothana2000
TSCu_Times
BPG Chveulebrivi
@@ -66,6 +67,7 @@
Helvetica
Khmer OS System
Lohit Punjabi
+ Lohit Oriya
Pothana2000
TSCu_Paranar
BPG Glaho
@@ -109,6 +111,7 @@
Terafik
Khmer OS System
Lohit Punjabi
+ Lohit Oriya
Pothana2000
TSCu_Paranar
BPG Courier
diff --git a/usr-share-doc-packages.patch b/usr-share-doc-packages.patch
new file mode 100644
index 0000000..b725828
--- /dev/null
+++ b/usr-share-doc-packages.patch
@@ -0,0 +1,96 @@
+diff -ru fontconfig-2.6.0//fc-cache/fc-cache.1 fontconfig-2.6.0.new//fc-cache/fc-cache.1
+--- fontconfig-2.6.0//fc-cache/fc-cache.1 2008-05-05 17:13:40.000000000 +0200
++++ fontconfig-2.6.0.new//fc-cache/fc-cache.1 2008-10-29 19:08:52.000000000 +0100
+@@ -68,7 +68,7 @@
+ \fBfc-list\fR (1).
+ .PP
+ The fontconfig user's guide, in HTML format:
+-\fI/usr/share/doc/fontconfig/fontconfig-user.html\fR\&.
++\fI/usr/share/doc/packages/fontconfig/fontconfig-user.html\fR\&.
+ .SH "AUTHOR"
+ .PP
+ This manual page was written by Keith Packard
+diff -ru fontconfig-2.6.0//fc-cache/fc-cache.sgml fontconfig-2.6.0.new//fc-cache/fc-cache.sgml
+--- fontconfig-2.6.0//fc-cache/fc-cache.sgml 2006-09-04 00:37:14.000000000 +0200
++++ fontconfig-2.6.0.new//fc-cache/fc-cache.sgml 2008-10-29 19:08:59.000000000 +0100
+@@ -177,7 +177,7 @@
+ fc-list (1).
+
+ The fontconfig user's guide, in HTML format:
+- /usr/share/doc/fontconfig/fontconfig-user.html.
++ /usr/share/doc/packages/fontconfig/fontconfig-user.html.
+
+
+
+diff -ru fontconfig-2.6.0//fc-cat/fc-cat.1 fontconfig-2.6.0.new//fc-cat/fc-cat.1
+--- fontconfig-2.6.0//fc-cat/fc-cat.1 2008-05-05 17:13:41.000000000 +0200
++++ fontconfig-2.6.0.new//fc-cat/fc-cat.1 2008-10-29 19:09:20.000000000 +0100
+@@ -38,7 +38,7 @@
+ \fBfc-cache\fR (1).
+ .PP
+ The fontconfig user's guide, in HTML format:
+-\fI/usr/share/doc/fontconfig/fontconfig-user.html\fR\&.
++\fI/usr/share/doc/packages/fontconfig/fontconfig-user.html\fR\&.
+ .SH "AUTHOR"
+ .PP
+ This manual page was written by Patrick Lam \&.
+diff -ru fontconfig-2.6.0//fc-cat/fc-cat.sgml fontconfig-2.6.0.new//fc-cat/fc-cat.sgml
+--- fontconfig-2.6.0//fc-cat/fc-cat.sgml 2006-12-03 00:08:03.000000000 +0100
++++ fontconfig-2.6.0.new//fc-cat/fc-cat.sgml 2008-10-29 19:09:08.000000000 +0100
+@@ -130,7 +130,7 @@
+ fc-cache (1).
+
+ The fontconfig user's guide, in HTML format:
+- /usr/share/doc/fontconfig/fontconfig-user.html.
++ /usr/share/doc/packages/fontconfig/fontconfig-user.html.
+
+
+
+diff -ru fontconfig-2.6.0//fc-list/fc-list.1 fontconfig-2.6.0.new//fc-list/fc-list.1
+--- fontconfig-2.6.0//fc-list/fc-list.1 2008-05-05 17:13:42.000000000 +0200
++++ fontconfig-2.6.0.new//fc-list/fc-list.1 2008-10-29 19:06:43.000000000 +0100
+@@ -54,7 +54,7 @@
+ \fBfc-cache\fR (1).
+ .PP
+ The fontconfig user's guide, in HTML format:
+-\fI/usr/share/doc/fontconfig/fontconfig-user.html\fR\&.
++\fI/usr/share/doc/packages/fontconfig/fontconfig-user.html\fR\&.
+ .SH "AUTHOR"
+ .PP
+ This manual page was written by Keith Packard
+diff -ru fontconfig-2.6.0//fc-list/fc-list.sgml fontconfig-2.6.0.new//fc-list/fc-list.sgml
+--- fontconfig-2.6.0//fc-list/fc-list.sgml 2006-08-27 23:36:52.000000000 +0200
++++ fontconfig-2.6.0.new//fc-list/fc-list.sgml 2008-10-29 19:08:27.000000000 +0100
+@@ -158,7 +158,7 @@
+ fc-cache (1).
+
+ The fontconfig user's guide, in HTML format:
+- /usr/share/doc/fontconfig/fontconfig-user.html.
++ /usr/share/doc/packages/fontconfig/fontconfig-user.html.
+
+
+
+diff -ru fontconfig-2.6.0//fc-match/fc-match.1 fontconfig-2.6.0.new//fc-match/fc-match.1
+--- fontconfig-2.6.0//fc-match/fc-match.1 2008-05-05 17:13:42.000000000 +0200
++++ fontconfig-2.6.0.new//fc-match/fc-match.1 2008-10-29 19:07:54.000000000 +0100
+@@ -45,7 +45,7 @@
+ \fBfc-list\fR (1).
+ .PP
+ The fontconfig user's guide, in HTML format:
+-\fI/usr/share/doc/fontconfig/fontconfig-user.html\fR\&.
++\fI/usr/share/doc/packages/fontconfig/fontconfig-user.html\fR\&.
+ .SH "AUTHOR"
+ .PP
+ This manual page was updated by Patrick Lam \&.
+diff -ru fontconfig-2.6.0//fc-match/fc-match.sgml fontconfig-2.6.0.new//fc-match/fc-match.sgml
+--- fontconfig-2.6.0//fc-match/fc-match.sgml 2006-09-04 00:37:14.000000000 +0200
++++ fontconfig-2.6.0.new//fc-match/fc-match.sgml 2008-10-29 19:08:06.000000000 +0100
+@@ -140,7 +140,7 @@
+ fc-list (1).
+
+ The fontconfig user's guide, in HTML format:
+- /usr/share/doc/fontconfig/fontconfig-user.html.
++ /usr/share/doc/packages/fontconfig/fontconfig-user.html.
+
+
+