- rel 3; install fontconfig files (from fc)

diff --git a/fonts-TTF-freefont-mono.conf b/fonts-TTF-freefont-mono.conf
new file mode 100644 (file)
index 0000000..dd56823
--- /dev/null
+++ b/fonts-TTF-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-TTF-freefont-sans.conf b/fonts-TTF-freefont-sans.conf
new file mode 100644 (file)
index 0000000..6ec9b37
--- /dev/null
+++ b/fonts-TTF-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-TTF-freefont-serif.conf b/fonts-TTF-freefont-serif.conf
new file mode 100644 (file)
index 0000000..806cd97
--- /dev/null
+++ b/fonts-TTF-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-TTF-freefont.spec b/fonts-TTF-freefont.spec
index 7a1a24d2e0990c716b043fa31e8330910ea8566b..f1e0563e602870a8ead85c9c9bf0ab0551568906 100644 (file)
--- a/fonts-TTF-freefont.spec
+++ b/fonts-TTF-freefont.spec
@@ -2,11 +2,14 @@ Summary:      Free UCS scalable fonts in TrueType format
 Summary(pl.UTF-8):     Wolnodostępne skalowalne fonty UCS w formacie TrueType
 Name:          fonts-TTF-freefont
 Version:       20120503
-Release:       2
+Release:       3
 License:       GPL v2
 Group:         Fonts
 Source0:       http://ftp.gnu.org/gnu/freefont/freefont-ttf-%{version}.zip
 # Source0-md5: 879b76d2e3c8003d567b555743f39154
+Source1:       %{name}-mono.conf
+Source2:       %{name}-sans.conf
+Source3:       %{name}-serif.conf
 URL:           http://www.gnu.org/software/freefont/
 BuildRequires: unzip
 Requires(post,postun): fontpostinst
@@ -29,9 +32,18 @@ skalowalnych pokrywających zakres uniwersalnego zestawu znaków ISO
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{ttffontsdir}
+install -d $RPM_BUILD_ROOT{%{ttffontsdir},%{_sysconfdir}/fonts/conf.d,%{_datadir}/fontconfig/conf.avail}
+
+cp -p *.ttf $RPM_BUILD_ROOT%{ttffontsdir}
+
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/fontconfig/conf.avail/69-freefont-ttf-mono.conf
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/fontconfig/conf.avail/69-freefont-ttf-sans.conf
+cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/fontconfig/conf.avail/69-freefont-ttf-serif.conf
+
+ln -s %{_datadir}/fontconfig/conf.avail/69-freefont-ttf-mono.conf $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
+ln -s %{_datadir}/fontconfig/conf.avail/69-freefont-ttf-sans.conf $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
+ln -s %{_datadir}/fontconfig/conf.avail/69-freefont-ttf-serif.conf $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
 
-install *.ttf $RPM_BUILD_ROOT%{ttffontsdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -48,3 +60,5 @@ fontpostinst TTF
 %{ttffontsdir}/FreeMono*.ttf
 %{ttffontsdir}/FreeSans*.ttf
 %{ttffontsdir}/FreeSerif*.ttf
+%{_datadir}/fontconfig/conf.avail/69-freefont-ttf-*.conf
+%{_sysconfdir}/fonts/conf.d/69-freefont-ttf-*.conf