[packages/fonts-TTF-RedHat-liberation] - rel 2; use configs from fc

[arekm]

commit 7bd035df3741d871bcbf59cc46de8a62e66c5a01
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sun Jul 29 22:08:10 2012 +0200

    - rel 2; use configs from fc

 59-liberation-mono.conf                | 46 ++++++++++++++++++++++++++++++++++
 59-liberation-sans.conf                | 16 ++++++++++++
 59-liberation-serif.conf               | 16 ++++++++++++
 fonts-TTF-RedHat-liberation.fontconfig | 23 -----------------
 fonts-TTF-RedHat-liberation.spec       | 26 ++++++++++++-------
 5 files changed, 95 insertions(+), 32 deletions(-)
---
diff --git a/59-liberation-mono.conf b/59-liberation-mono.conf
new file mode 100644
index 0000000..d96e5a1
--- /dev/null
+++ b/59-liberation-mono.conf
@@ -0,0 +1,46 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+  <alias>
+    <family>sans-serif</family>
+    <prefer>
+      <family>Liberation Sans Narrow</family>
+    </prefer>
+  </alias>
+  <alias>
+    <family>Liberation Sans Narrow</family>
+    <default>
+      <family>sans-serif</family>
+    </default>
+  </alias>
+
+  <match target="font">
+    <test name="family" ignore-blanks="true">
+	<string>Liberation Mono</string>
+    </test>
+    <edit name="autohint" mode="assign">
+	<bool>false</bool>
+    </edit>
+    <edit name="hinting" mode="assign">
+	<bool>true</bool>
+    </edit>
+
+  </match>
+  <match target="font">
+    <test name="family" ignore-blanks="true">
+	<string>Liberation Mono</string>
+    </test>
+    <test name="pixelsize" compare="less_eq">
+	<double>17</double>
+    </test>
+    <test name="pixelsize" compare="more">
+	<double>8</double>
+    </test>
+    <edit name="autohint" mode="assign">
+	<bool>true</bool>
+    </edit>
+    <edit name="hinting" mode="assign">
+	<bool>false</bool>
+    </edit>
+  </match>
+</fontconfig>
diff --git a/59-liberation-sans.conf b/59-liberation-sans.conf
new file mode 100644
index 0000000..528d872
--- /dev/null
+++ b/59-liberation-sans.conf
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+  <alias>
+    <family>sans-serif</family>
+    <prefer>
+      <family>Liberation Sans</family>
+    </prefer>
+  </alias>
+  <alias>
+    <family>Liberation Sans</family>
+    <default>
+      <family>sans-serif</family>
+    </default>
+  </alias>
+</fontconfig>
diff --git a/59-liberation-serif.conf b/59-liberation-serif.conf
new file mode 100644
index 0000000..fdbe20d
--- /dev/null
+++ b/59-liberation-serif.conf
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+  <alias>
+    <family>sans-serif</family>
+    <prefer>
+      <family>Liberation Sans Narrow</family>
+    </prefer>
+  </alias>
+  <alias>
+    <family>Liberation Sans Narrow</family>
+    <default>
+      <family>sans-serif</family>
+    </default>
+  </alias>
+</fontconfig>
diff --git a/fonts-TTF-RedHat-liberation.spec b/fonts-TTF-RedHat-liberation.spec
index f8a1cef..283bbe8 100644
--- a/fonts-TTF-RedHat-liberation.spec
+++ b/fonts-TTF-RedHat-liberation.spec
@@ -2,14 +2,16 @@ Summary:	Fonts to replace commonly used Microsoft Windows Fonts
 Summary(pl.UTF-8):	Fonty zastępujące popularne fonty z Microsoft Windows
 Name:		fonts-TTF-RedHat-liberation
 Version:	2.00.0
-Release:	1
+Release:	2
 Epoch:		1
 License:	OFL
 Group:		Fonts
 Source0:	https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-%{version}.tar.gz
-# Source0-md5:	5b5055ed755025891f908b7726fea482
-Source1:	%{name}.fontconfig
-Source2:	generate.pe
+# Source0-md5:	293b364f3de019f0b19ddd54d36737e6
+Source1:	generate.pe
+Source2:	59-liberation-mono.conf
+Source3:	59-liberation-sans.conf
+Source4:	59-liberation-serif.conf
 URL:		https://fedorahosted.org/liberation-fonts/
 BuildRequires:	fontforge >= 20090923
 Requires(post,postun):	fontpostinst
@@ -42,7 +44,7 @@ Bitstream Vera Sans Mono).
 
 %prep
 %setup -q -n liberation-fonts-%{version}
-install -m755 %{SOURCE2} .
+install -m755 %{SOURCE1} .
 
 %build
 rm -f *.ttf
@@ -55,8 +57,14 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.avail
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
 
 cp -a *.ttf $RPM_BUILD_ROOT%{_ttffontsdir}
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.avail/60-liberation.conf
-ln -s ../conf.avail/60-liberation.conf $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
+
+install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.avail/59-liberation-mono.conf
+install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.avail/59-liberation-sans.conf
+install %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.avail/59-liberation-serif.conf
+
+ln -s ../conf.avail/59-liberation-mono.conf $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
+ln -s ../conf.avail/59-liberation-sans.conf $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
+ln -s ../conf.avail/59-liberation-serif.conf $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -73,5 +81,5 @@ fontpostinst TTF
 %{_ttffontsdir}/LiberationMono*.ttf
 %{_ttffontsdir}/LiberationSans*.ttf
 %{_ttffontsdir}/LiberationSerif*.ttf
-%{_sysconfdir}/fonts/conf.avail/60-liberation.conf
-%{_sysconfdir}/fonts/conf.d/60-liberation.conf
+%{_sysconfdir}/fonts/conf.avail/59-liberation-*.conf
+%{_sysconfdir}/fonts/conf.d/59-liberation-*.conf