From 85b6f28c6bb59b975da327e5023bc6d88e8c7b4586baa914b7ce413dfcd532eb Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Wed, 21 May 2008 21:41:10 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/fontconfig?expand=0&rev=12

---
 29-liberation-aliases.conf | 35 +++++++++++++++++++++++++++++++++++
 fontconfig.changes         | 11 +++++++++++
 fontconfig.spec            | 13 ++++++++++++-
 suse-generic-names.conf    |  3 +++
 suse-post-user.conf        |  3 +++
 5 files changed, 64 insertions(+), 1 deletion(-)
 create mode 100644 29-liberation-aliases.conf

diff --git a/29-liberation-aliases.conf b/29-liberation-aliases.conf
new file mode 100644
index 0000000..2f25a29
--- /dev/null
+++ b/29-liberation-aliases.conf
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+<!--
+ The "Liberation" fonts are metric compatible fonts for these three web font
+ families:
+ -->
+ 	<alias>
+		<family>Times New Roman</family>
+		<accept><family>Liberation Serif</family></accept>
+	</alias>
+ 	<alias>
+		<family>Thorndale AMT</family>
+		<accept><family>Liberation Serif</family></accept>
+	</alias>
+
+ 	<alias>
+		<family>Arial</family>
+		<accept><family>Liberation Sans</family></accept>
+	</alias>
+ 	<alias>
+		<family>Albany AMT</family>
+		<accept><family>Liberation Sans</family></accept>
+	</alias>
+
+ 	<alias>
+		<family>Courier New</family>
+		<accept><family>Liberation Mono</family></accept>
+	</alias>
+ 	<alias>
+		<family>Cumberland AMT</family>
+		<accept><family>Liberation Mono</family></accept>
+	</alias>
+
+</fontconfig>
diff --git a/fontconfig.changes b/fontconfig.changes
index e48be7d..658f43a 100644
--- a/fontconfig.changes
+++ b/fontconfig.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Wed May 21 15:54:42 CEST 2008 - mfabian@suse.de
+
+- bnc#378463:
+  • accept "Liberation Serif", "Liberation Sans", and
+    "Liberation Mono" as fallbacks for "Times New Roman", "Arial",
+    and "Courier New" respectively.
+  • Mark the "Liberation" fonts with their generics to get
+    reasonable fallbacks if they are not installed.
+  • Add these fonts to the preference lists (below DejaVu).
+
 -------------------------------------------------------------------
 Thu Apr 10 12:54:45 CEST 2008 - ro@suse.de
 
diff --git a/fontconfig.spec b/fontconfig.spec
index 1f823e7..4f9d9b9 100644
--- a/fontconfig.spec
+++ b/fontconfig.spec
@@ -24,7 +24,7 @@ Url:            http://fontconfig.org/
 AutoReqProv:    on
 Requires:       bash
 Version:        2.4.2
-Release:        79
+Release:        87
 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
@@ -46,6 +46,7 @@ Source13:       suse-hinting.conf
 Source14:       suse-bitmaps.conf
 Source15:       suse-font-dirs.conf
 Source20:       local.conf.instsys
+Source30:       29-liberation-aliases.conf
 Patch4:         fc-match.patch
 # http://www.kde.gr.jp/~akito/patch/
 # http://www.kde.gr.jp/~akito/patch/fontconfig/fontconfig-2.2.1/fontconfig-2.2.1-AppleRoman-DynaFont.patch
@@ -177,9 +178,11 @@ done
 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/
 install -m 644 $RPM_SOURCE_DIR/local.conf.instsys $RPM_BUILD_ROOT/etc/fonts/
+install -m 644 $RPM_SOURCE_DIR/29-liberation-aliases.conf $RPM_BUILD_ROOT/etc/fonts/conf.avail
 # tune links in conf.d:
 pushd $RPM_BUILD_ROOT/etc/fonts/conf.d
     ln -s ../suse-font-dirs.conf 05-suse-font-dirs.conf
+    ln -s ../conf.avail/29-liberation-aliases.conf 29-liberation-aliases.conf 
     rm -f 50-user.conf
     rm -f 51-local.conf
     ln -s ../suse-pre-user.conf 50-suse-pre-user.conf
@@ -234,6 +237,14 @@ rm -rf $RPM_BUILD_ROOT
 %{myprefix}/include/fontconfig/
 
 %changelog
+* Wed May 21 2008 mfabian@suse.de
+- bnc#378463:
+  • accept "Liberation Serif", "Liberation Sans", and
+  "Liberation Mono" as fallbacks for "Times New Roman", "Arial",
+  and "Courier New" respectively.
+  • Mark the "Liberation" fonts with their generics to get
+  reasonable fallbacks if they are not installed.
+  • Add these fonts to the preference lists (below DejaVu).
 * Thu Apr 10 2008 ro@suse.de
 - added baselibs.conf file to build xxbit packages
   for multilib support
diff --git a/suse-generic-names.conf b/suse-generic-names.conf
index 56fb1c0..db86bf8 100644
--- a/suse-generic-names.conf
+++ b/suse-generic-names.conf
@@ -16,6 +16,7 @@
 		<family>Thorndale AMT</family>
 		<family>SUSE Serif</family>
 		<family>FreeSerif</family>
+		<family>Liberation Serif</family>
 		<family>HGMinchoL</family>
 		<family>HGPMinchoL</family>
 		<family>HGPMinchoB</family>
@@ -38,6 +39,7 @@
 		<family>Albany AMT</family>
 		<family>SUSE Sans</family>
 		<family>FreeSans</family>
+		<family>Liberation Sans</family>
 		<family>HGGothicB</family>
 		<family>HGPGothicB</family>
 		<family>HGGothicE</family>
@@ -60,6 +62,7 @@
 		<family>Cumberland AMT</family>
 		<family>SUSE Sans Mono</family>
 		<family>FreeMono</family>
+		<family>Liberation Mono</family>
 		<default><family>monospace</family></default>
 	</alias>
 
diff --git a/suse-post-user.conf b/suse-post-user.conf
index 9b97966..c9d54da 100644
--- a/suse-post-user.conf
+++ b/suse-post-user.conf
@@ -13,6 +13,7 @@
 			<family>Times New Roman</family>
 			<family>Thorndale AMT</family>
 			<family>DejaVu Serif</family>
+			<family>Liberation Serif</family>
 			<family>SUSE Serif</family>
 			<family>Bitstream Vera Serif</family>
 			<family>Nimbus Roman No9 L</family>
@@ -55,6 +56,7 @@
 			<family>Albany AMT</family>
 			<family>Verdana</family>
 			<family>DejaVu Sans</family>
+			<family>Liberation Sans</family>
 			<family>SUSE Sans</family>
 			<family>Bitstream Vera Sans</family>
 			<family>Nimbus Sans L</family>
@@ -95,6 +97,7 @@
 			<family>Consolas</family>
 			<family>Andale Mono</family>
 			<family>DejaVu Sans Mono</family>
+			<family>Liberation Sans</family>
 			<family>SUSE Sans Mono</family>
 			<family>Bitstream Vera Sans Mono</family>
 			<family>Courier New</family>