- rel 3; install fontconfig files (from fc)

diff --git a/fonts-OTF-freefont-mono.conf b/fonts-OTF-freefont-mono.conf
new file mode 100644 (file)
index 0000000..dd56823
--- /dev/null
+++ b/fonts-OTF-freefont-mono.conf
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<fontconfig>
+  <alias>
+    <family>monospace</family>
+    <prefer>
+      <family>FreeMono</family>
+    </prefer>
+  </alias>
+  <alias>
+    <family>FreeMono</family>
+    <default>
+      <family>monospace</family>
+    </default>
+  </alias>
+</fontconfig>

diff --git a/fonts-OTF-freefont-sans.conf b/fonts-OTF-freefont-sans.conf
new file mode 100644 (file)
index 0000000..6ec9b37
--- /dev/null
+++ b/fonts-OTF-freefont-sans.conf
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<fontconfig>
+  <alias>
+    <family>sans-serif</family>
+    <prefer>
+      <family>FreeSans</family>
+    </prefer>
+  </alias>
+  <alias>
+    <family>FreeSans</family>
+    <default>
+      <family>sans-serif</family>
+    </default>
+  </alias>
+
+ <match target="scan">
+    <test name="family">
+      <string>FreeSans</string>
+    </test>
+    <edit name="lang" mode="assign">
+      <minus>
+        <name>lang</name>
+        <langset>
+          <string>bho</string>
+          <string>brx</string>
+          <string>doi</string>
+          <string>hi</string>
+          <string>hne</string>
+          <string>kok</string>
+          <string>mai</string>
+          <string>mr</string>
+          <string>sa</string>
+          <string>sat</string>
+          <string>as</string>
+          <string>bn</string>
+          <string>pa</string>
+        </langset>
+      </minus>
+    </edit>
+  </match>
+
+</fontconfig>

diff --git a/fonts-OTF-freefont-serif.conf b/fonts-OTF-freefont-serif.conf
new file mode 100644 (file)
index 0000000..806cd97
--- /dev/null
+++ b/fonts-OTF-freefont-serif.conf
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<fontconfig>
+  <alias>
+    <family>serif</family>
+    <prefer>
+      <family>FreeSerif</family>
+    </prefer>
+  </alias>
+  <alias>
+    <family>FreeSerif</family>
+    <default>
+      <family>serif</family>
+    </default>
+  </alias>
+
+ <match target="scan">
+    <test name="family">
+      <string>FreeSerif</string>
+    </test>
+    <edit name="lang" mode="assign">
+      <minus>
+        <name>lang</name>
+        <langset>
+          <string>bho</string>
+          <string>brx</string>
+          <string>doi</string>
+          <string>hi</string>
+          <string>hne</string>
+          <string>kok</string>
+          <string>mai</string>
+          <string>mr</string>
+          <string>sa</string>
+          <string>sat</string>
+          <string>as</string>
+          <string>bn</string>
+          <string>pa</string>
+        </langset>
+      </minus>
+    </edit>
+  </match>
+
+</fontconfig>

diff --git a/fonts-OTF-freefont.spec b/fonts-OTF-freefont.spec
index 6470cac02e3b1ce5d0adb80334a717431870c3ad..c248f76b87b546d2a59212dc8f5f8c5787971dd9 100644 (file)
--- a/fonts-OTF-freefont.spec
+++ b/fonts-OTF-freefont.spec
@@ -2,11 +2,14 @@ Summary:      Free UCS scalable fonts in OpenType format
 Summary(pl.UTF-8):     Wolnodostępne skalowalne fonty UCS w formacie OpenType
 Name:          fonts-OTF-freefont
 Version:       20120503
-Release:       2
+Release:       3
 License:       GPL v2
 Group:         Fonts
 Source0:       http://ftp.gnu.org/gnu/freefont/freefont-otf-%{version}.tar.gz
 # Source0-md5: e23c149a4cc494ac1f473f13cca16b67
+Source1:       %{name}-mono.conf
+Source2:       %{name}-sans.conf
+Source3:       %{name}-serif.conf
 URL:           http://www.gnu.org/software/freefont/
 Requires(post,postun): fontpostinst
 BuildArch:     noarch
@@ -28,9 +31,17 @@ skalowalnych pokrywających zakres uniwersalnego zestawu znaków ISO
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{otffontsdir}
+install -d $RPM_BUILD_ROOT{%{otffontsdir},%{_sysconfdir}/fonts/conf.d,%{_datadir}/fontconfig/conf.avail}
 
-install *.otf $RPM_BUILD_ROOT%{otffontsdir}
+cp -p *.otf $RPM_BUILD_ROOT%{otffontsdir}
+
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/fontconfig/conf.avail/69-freefont-otf-mono.conf
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/fontconfig/conf.avail/69-freefont-otf-sans.conf
+cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/fontconfig/conf.avail/69-freefont-otf-serif.conf
+
+ln -s %{_datadir}/fontconfig/conf.avail/69-freefont-otf-mono.conf $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
+ln -s %{_datadir}/fontconfig/conf.avail/69-freefont-otf-sans.conf $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
+ln -s %{_datadir}/fontconfig/conf.avail/69-freefont-otf-serif.conf $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -47,3 +58,5 @@ fontpostinst OTF
 %{otffontsdir}/FreeMono*.otf
 %{otffontsdir}/FreeSans*.otf
 %{otffontsdir}/FreeSerif*.otf
+%{_datadir}/fontconfig/conf.avail/69-freefont-otf-*.conf
+%{_sysconfdir}/fonts/conf.d/69-freefont-otf-*.conf