[packages/fonts-TTF-RedHat-liberation] - rel 4; merge changes from fc
arekm
arekm at pld-linux.org
Tue Sep 18 17:43:02 CEST 2012
commit b7cf6633e89a1c2faab95a26c4e902703641a3a8
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Tue Sep 18 17:42:55 2012 +0200
- rel 4; merge changes from fc
30-0-liberation-mono.conf | 18 ++++++++++++++++
30-0-liberation-sans.conf | 18 ++++++++++++++++
30-0-liberation-serif.conf | 18 ++++++++++++++++
59-liberation-mono.conf | 46 ----------------------------------------
59-liberation-sans.conf | 16 --------------
59-liberation-serif.conf | 16 --------------
fonts-TTF-RedHat-liberation.spec | 24 ++++++++++-----------
generate.pe | 4 ++--
8 files changed, 68 insertions(+), 92 deletions(-)
---
diff --git a/fonts-TTF-RedHat-liberation.spec b/fonts-TTF-RedHat-liberation.spec
index 0132fe4..3b6c879 100644
--- a/fonts-TTF-RedHat-liberation.spec
+++ b/fonts-TTF-RedHat-liberation.spec
@@ -2,16 +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: 3
+Release: 4
Epoch: 1
License: OFL
Group: Fonts
Source0: https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-%{version}.tar.gz
# Source0-md5: 5b5055ed755025891f908b7726fea482
Source1: generate.pe
-Source2: 59-liberation-mono.conf
-Source3: 59-liberation-sans.conf
-Source4: 59-liberation-serif.conf
+Source2: 30-0-liberation-mono.conf
+Source3: 30-0-liberation-sans.conf
+Source4: 30-0-liberation-serif.conf
URL: https://fedorahosted.org/liberation-fonts/
BuildRequires: fontforge >= 20090923
Requires(post,postun): fontpostinst
@@ -61,13 +61,13 @@ install -d $RPM_BUILD_ROOT{%{_ttffontsdir},%{_sysconfdir}/fonts/conf.d,%{_datadi
cp -p *.ttf $RPM_BUILD_ROOT%{_ttffontsdir}
-cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/fontconfig/conf.avail/59-liberation-mono.conf
-cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/fontconfig/conf.avail/59-liberation-sans.conf
-cp -p %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/fontconfig/conf.avail/59-liberation-serif.conf
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/fontconfig/conf.avail/30-0-liberation-mono.conf
+cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/fontconfig/conf.avail/30-0-liberation-sans.conf
+cp -p %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/fontconfig/conf.avail/30-0-liberation-serif.conf
-ln -s %{_datadir}/fontconfig/conf.avail/59-liberation-mono.conf $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
-ln -s %{_datadir}/fontconfig/conf.avail/59-liberation-sans.conf $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
-ln -s %{_datadir}/fontconfig/conf.avail/59-liberation-serif.conf $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
+ln -s %{_datadir}/fontconfig/conf.avail/30-0-liberation-mono.conf $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
+ln -s %{_datadir}/fontconfig/conf.avail/30-0-liberation-sans.conf $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
+ln -s %{_datadir}/fontconfig/conf.avail/30-0-liberation-serif.conf $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
%clean
rm -rf $RPM_BUILD_ROOT
@@ -84,5 +84,5 @@ fontpostinst TTF
%{_ttffontsdir}/LiberationMono*.ttf
%{_ttffontsdir}/LiberationSans*.ttf
%{_ttffontsdir}/LiberationSerif*.ttf
-%{_datadir}/fontconfig/conf.avail/59-liberation-*.conf
-%{_sysconfdir}/fonts/conf.d/59-liberation-*.conf
+%{_datadir}/fontconfig/conf.avail/30-0-liberation-*.conf
+%{_sysconfdir}/fonts/conf.d/30-0-liberation-*.conf
diff --git a/30-0-liberation-mono.conf b/30-0-liberation-mono.conf
new file mode 100644
index 0000000..91b2f57
--- /dev/null
+++ b/30-0-liberation-mono.conf
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<fontconfig>
+ <!-- Microsoft -->
+ <alias binding="same">
+ <family>Courier New</family>
+ <accept>
+ <family>Liberation Mono</family>
+ </accept>
+ </alias>
+ <alias binding="same">
+ <family>Liberation Mono</family>
+ <default>
+ <family>Courier New</family>
+ </default>
+ </alias>
+</fontconfig>
+
diff --git a/30-0-liberation-sans.conf b/30-0-liberation-sans.conf
new file mode 100644
index 0000000..ab592b7
--- /dev/null
+++ b/30-0-liberation-sans.conf
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<fontconfig>
+ <!-- Microsoft -->
+ <alias binding="same">
+ <family>Arial</family>
+ <accept>
+ <family>Liberation Sans</family>
+ </accept>
+ </alias>
+ <alias binding="same">
+ <family>Liberation Sans</family>
+ <default>
+ <family>Arial</family>
+ </default>
+ </alias>
+</fontconfig>
+
diff --git a/30-0-liberation-serif.conf b/30-0-liberation-serif.conf
new file mode 100644
index 0000000..4aafd48
--- /dev/null
+++ b/30-0-liberation-serif.conf
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<fontconfig>
+ <!-- Microsoft -->
+ <alias binding="same">
+ <family>Times New Roman</family>
+ <accept>
+ <family>Liberation Serif</family>
+ </accept>
+ </alias>
+ <alias binding="same">
+ <family>Liberation Serif</family>
+ <default>
+ <family>Times New Roman</family>
+ </default>
+ </alias>
+</fontconfig>
+
diff --git a/59-liberation-mono.conf b/59-liberation-mono.conf
deleted file mode 100644
index d96e5a1..0000000
--- a/59-liberation-mono.conf
+++ /dev/null
@@ -1,46 +0,0 @@
-<?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
deleted file mode 100644
index 528d872..0000000
--- a/59-liberation-sans.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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
deleted file mode 100644
index fdbe20d..0000000
--- a/59-liberation-serif.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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/generate.pe b/generate.pe
old mode 100755
new mode 100644
index 0b97159..bf9bcb2
--- a/generate.pe
+++ b/generate.pe
@@ -12,8 +12,8 @@ endif
i = 1
while ( i < $argc )
Open($argv[i], 1)
- #Use gen_flags=Defualt fmflags value as -1
- gen_flags = -1
+ #Use gen_flags=Defualt fmflags value as -1
+ gen_flags = -1
Generate("" + $fontname + ".ttf", "", gen_flags)
i++
endloop
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/fonts-TTF-RedHat-liberation.git/commitdiff/b7cf6633e89a1c2faab95a26c4e902703641a3a8
More information about the pld-cvs-commit
mailing list