Hello community, here is the log from the commit of package fontconfig for openSUSE:Factory checked in at 2013-12-08 19:26:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fontconfig (Old) and /work/SRC/openSUSE:Factory/.fontconfig.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fontconfig" Changes: -------- --- /work/SRC/openSUSE:Factory/fontconfig/fontconfig.changes 2013-10-14 09:26:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.fontconfig.new/fontconfig.changes 2013-12-08 19:26:37.000000000 +0100 @@ -1,0 +2,10 @@ +Fri Dec 6 13:33:14 UTC 2013 - fcro...@suse.com + +- Add + 0001-Fix-inversion-between-Tinos-and-Cousine-in-the-comme.patch: + fix error in 30-metric-aliases.conf comments (fdo#72395). +- Add + 0002-Add-metric-aliases-for-additional-Google-ChromeOS-fo.patch: + add compat fonts for Cambria, Caladea and Symbol (fdo#72395). + +------------------------------------------------------------------- New: ---- 0001-Fix-inversion-between-Tinos-and-Cousine-in-the-comme.patch 0002-Add-metric-aliases-for-additional-Google-ChromeOS-fo.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fontconfig.spec ++++++ --- /var/tmp/diff_new_pack.LvW61T/_old 2013-12-08 19:26:38.000000000 +0100 +++ /var/tmp/diff_new_pack.LvW61T/_new 2013-12-08 19:26:38.000000000 +0100 @@ -74,6 +74,9 @@ Patch0: make-check.patch # suse specific Patch1: usr-share-doc-packages.patch +# fix submitted upstream +Patch2: 0001-Fix-inversion-between-Tinos-and-Cousine-in-the-comme.patch +Patch3: 0002-Add-metric-aliases-for-additional-Google-ChromeOS-fo.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: ipa-fonts-config = 003.02 Obsoletes: ipa-fonts-config <= 003.02 @@ -118,6 +121,8 @@ %endif %patch0 -p1 %patch1 -p1 +%patch2 -p1 +%patch3 -p1 %build # ----- build with automake 1.13 ++++++ 0001-Fix-inversion-between-Tinos-and-Cousine-in-the-comme.patch ++++++ >From 88c90a10646f27f597c2cb91c6a8df71bbf4669f Mon Sep 17 00:00:00 2001 From: Frederic Crozat <fcro...@suse.com> Date: Fri, 6 Dec 2013 14:08:08 +0100 Subject: [PATCH 1/2] Fix inversion between Tinos and Cousine in the comment --- conf.d/30-metric-aliases.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf.d/30-metric-aliases.conf b/conf.d/30-metric-aliases.conf index d0d9ea2..c9ee79f 100644 --- a/conf.d/30-metric-aliases.conf +++ b/conf.d/30-metric-aliases.conf @@ -22,8 +22,8 @@ Microsoft fonts: Liberation fonts: Google CrOS core fonts: StarOffice fo ================ ====================== ======================= ================= ============== Arial Liberation Sans Arimo Albany Albany AMT Arial Narrow Liberation Sans Narrow -Times New Roman Liberation Serif Cousine Thorndale Thorndale AMT -Courier New Liberation Mono Tinos Cumberland Cumberland AMT +Times New Roman Liberation Serif Tinos Thorndale Thorndale AMT +Courier New Liberation Mono Cousine Cumberland Cumberland AMT Microsoft fonts: Other fonts: ================ ============ -- 1.8.4 ++++++ 0002-Add-metric-aliases-for-additional-Google-ChromeOS-fo.patch ++++++ >From 74b9be6b4030ac1bfd4c20b52bbcdeb66373eaba Mon Sep 17 00:00:00 2001 From: Frederic Crozat <fcro...@suse.com> Date: Fri, 6 Dec 2013 14:23:52 +0100 Subject: [PATCH 2/2] Add metric aliases for additional Google ChromeOS fonts MS fonts Cambria, Symbol and Calibri have compat metrics fonts from ChromeOS. --- conf.d/30-metric-aliases.conf | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/conf.d/30-metric-aliases.conf b/conf.d/30-metric-aliases.conf index c9ee79f..49a9602 100644 --- a/conf.d/30-metric-aliases.conf +++ b/conf.d/30-metric-aliases.conf @@ -24,6 +24,9 @@ Arial Liberation Sans Arimo Albany Arial Narrow Liberation Sans Narrow Times New Roman Liberation Serif Tinos Thorndale Thorndale AMT Courier New Liberation Mono Cousine Cumberland Cumberland AMT +Cambria Caladea +Calibri Carlito +Symbol SymbolNeu Microsoft fonts: Other fonts: ================ ============ @@ -307,7 +310,26 @@ but in an order preferring similar designs first. We do this in three steps: </default> </alias> + <alias binding="same"> + <family>Caladea</family> + <default> + <family>Cambria</family> + </default> + </alias> + <alias binding="same"> + <family>Carlito</family> + <default> + <family>Calibri</family> + </default> + </alias> + + <alias binding="same"> + <family>SymbolNeu</family> + <default> + <family>Symbol</family> + </default> + </alias> <!-- Accept the other group as fallback --> @@ -494,4 +516,25 @@ but in an order preferring similar designs first. We do this in three steps: </accept> </alias> + <alias binding="same"> + <family>Cambria</family> + <accept> + <family>Caladea</family> + </accept> + </alias> + + <alias binding="same"> + <family>Calibri</family> + <accept> + <family>Carlito</family> + </accept> + </alias> + + <alias binding="same"> + <family>Symbol</family> + <accept> + <family>SymbolNeu</family> + </accept> + </alias> + </fontconfig> -- 1.8.4 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org