diff --git a/65-culmus-aharoni-clm.conf b/65-culmus-aharoni-clm.conf deleted file mode 100644 index cfb972a..0000000 --- a/65-culmus-aharoni-clm.conf +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - Guttman Aharoni - Aharoni CLM - - - - Guttman-Aharoni - Aharoni CLM - - - - Aharoni - Aharoni CLM - - - - - - Aharoni CLM - - sans-serif - - - - - - - he-il - - - sans-serif - - - Aharoni CLM - - - - diff --git a/65-culmus-caladings-clm.conf b/65-culmus-caladings-clm.conf deleted file mode 100644 index 17fd505..0000000 --- a/65-culmus-caladings-clm.conf +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - Caladings Caladings CLM - - - - Caladings CLM - - fantasy - - - - diff --git a/65-culmus-drugulin-clm.conf b/65-culmus-drugulin-clm.conf deleted file mode 100644 index 6a598fa..0000000 --- a/65-culmus-drugulin-clm.conf +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - Guttman Drogolin - Drugulin CLM - - - - Guttman Vilna - Drugulin CLM - - - Drugulin Drugulin CLM - - - - Drugulin CLM - - serif - - - - - - - he-il - - - serif - - - Drugulin CLM - - - - diff --git a/65-culmus-ellinia-clm.conf b/65-culmus-ellinia-clm.conf deleted file mode 100644 index 0b7e922..0000000 --- a/65-culmus-ellinia-clm.conf +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - Ellinia Ellinia CLM - - - - Ellinia CLM - - sans-serif - - - - - - - he-il - - - sans-serif - - - Ellinia CLM - - - - diff --git a/65-culmus-frank-ruehl-clm.conf b/65-culmus-frank-ruehl-clm.conf deleted file mode 100644 index 6bae077..0000000 --- a/65-culmus-frank-ruehl-clm.conf +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - FrankRuehl - Frank Ruehl CLM - - - - Guttman Frank - Frank Ruehl CLM - - - - Guttman Frnew - Frank Ruehl CLM - - - Frank Ruehl Frank Ruehl CLM - - - New Peninim MT Frank Ruehl CLM - - - - Frank Ruehl CLM - - serif - - - - - - - he-il - - - serif - - - Frank Ruehl CLM - - - - diff --git a/65-culmus-hadasim-clm.conf b/65-culmus-hadasim-clm.conf deleted file mode 100644 index 08882fd..0000000 --- a/65-culmus-hadasim-clm.conf +++ /dev/null @@ -1,17 +0,0 @@ - - - - - serif - - Hadasim CLM - - - - Hadasim CLM - - serif - - - - diff --git a/65-culmus-keteryg.conf b/65-culmus-keteryg.conf deleted file mode 100644 index 0286f8d..0000000 --- a/65-culmus-keteryg.conf +++ /dev/null @@ -1,17 +0,0 @@ - - - - - serif - - Keter YG - - - - Keter YG - - serif - - - - diff --git a/65-culmus-miriam-clm.conf b/65-culmus-miriam-clm.conf deleted file mode 100644 index 73d15cc..0000000 --- a/65-culmus-miriam-clm.conf +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - Guttman Miryam - Miriam CLM - - - - Levenim MT - Miriam CLM - - - - Miriam - Miriam CLM - - - - Miriam Transparent - Miriam CLM - - - - Miriam CLM - - sans-serif - - - - - - - he-il - - - sans-serif - - - Miriam CLM - - - - diff --git a/65-culmus-miriam-mono-clm.conf b/65-culmus-miriam-mono-clm.conf deleted file mode 100644 index 0cf5c8e..0000000 --- a/65-culmus-miriam-mono-clm.conf +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - Fixed Miriam Transparent - Miriam Mono CLM - - - - Guttman Myamfix - Miriam Mono CLM - - - - Guttman-CourMir - Miriam Mono CLM - - - - Miriam Fixed - Miriam Mono CLM - - - Miriam Mono Miriam Mono CLM - - - - - Miriam Mono CLM - - sans-serif - - - - - - - he-il - - - sans-serif - - - Miriam Mono CLM - - - - diff --git a/65-culmus-nachlieli-clm.conf b/65-culmus-nachlieli-clm.conf deleted file mode 100644 index e81863b..0000000 --- a/65-culmus-nachlieli-clm.conf +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - Nachlieli Nachlieli CLM - - - ArialHB Nachlieli CLM - - - - - Nachlieli CLM - - sans-serif - - - - - - - he-il - - - sans-serif - - - Nachlieli CLM - - - - diff --git a/65-culmus-shofar.conf b/65-culmus-shofar.conf deleted file mode 100644 index 032ab31..0000000 --- a/65-culmus-shofar.conf +++ /dev/null @@ -1,17 +0,0 @@ - - - - - serif - - Shofar - - - - Shofar - - serif - - - - diff --git a/65-culmus-simple-clm.conf b/65-culmus-simple-clm.conf deleted file mode 100644 index b8f0263..0000000 --- a/65-culmus-simple-clm.conf +++ /dev/null @@ -1,17 +0,0 @@ - - - - - sans-serif - - Simple CLM - - - - Simple CLM - - sans-serif - - - - diff --git a/65-culmus-stamashkenaz-clm.conf b/65-culmus-stamashkenaz-clm.conf deleted file mode 100644 index fb6695f..0000000 --- a/65-culmus-stamashkenaz-clm.conf +++ /dev/null @@ -1,17 +0,0 @@ - - - - - serif - - Stam Ashkenaz CLM - - - - Stam Ashkenaz CLM - - serif - - - - diff --git a/65-culmus-stamsefarad-clm.conf b/65-culmus-stamsefarad-clm.conf deleted file mode 100644 index 0fea2a6..0000000 --- a/65-culmus-stamsefarad-clm.conf +++ /dev/null @@ -1,17 +0,0 @@ - - - - - serif - - Stam Sefarad CLM - - - - Stam Sefarad CLM - - serif - - - - diff --git a/66-culmus-aharoni-clm.conf b/66-culmus-aharoni-clm.conf new file mode 100644 index 0000000..cfb972a --- /dev/null +++ b/66-culmus-aharoni-clm.conf @@ -0,0 +1,44 @@ + + + + + + + + Guttman Aharoni + Aharoni CLM + + + + Guttman-Aharoni + Aharoni CLM + + + + Aharoni + Aharoni CLM + + + + + + Aharoni CLM + + sans-serif + + + + + + + he-il + + + sans-serif + + + Aharoni CLM + + + + diff --git a/66-culmus-caladings-clm.conf b/66-culmus-caladings-clm.conf new file mode 100644 index 0000000..17fd505 --- /dev/null +++ b/66-culmus-caladings-clm.conf @@ -0,0 +1,16 @@ + + + + + + Caladings Caladings CLM + + + + Caladings CLM + + fantasy + + + + diff --git a/66-culmus-drugulin-clm.conf b/66-culmus-drugulin-clm.conf new file mode 100644 index 0000000..6a598fa --- /dev/null +++ b/66-culmus-drugulin-clm.conf @@ -0,0 +1,39 @@ + + + + + + + Guttman Drogolin + Drugulin CLM + + + + Guttman Vilna + Drugulin CLM + + + Drugulin Drugulin CLM + + + + Drugulin CLM + + serif + + + + + + + he-il + + + serif + + + Drugulin CLM + + + + diff --git a/66-culmus-ellinia-clm.conf b/66-culmus-ellinia-clm.conf new file mode 100644 index 0000000..0b7e922 --- /dev/null +++ b/66-culmus-ellinia-clm.conf @@ -0,0 +1,29 @@ + + + + + + Ellinia Ellinia CLM + + + + Ellinia CLM + + sans-serif + + + + + + + he-il + + + sans-serif + + + Ellinia CLM + + + + diff --git a/66-culmus-frank-ruehl-clm.conf b/66-culmus-frank-ruehl-clm.conf new file mode 100644 index 0000000..6bae077 --- /dev/null +++ b/66-culmus-frank-ruehl-clm.conf @@ -0,0 +1,47 @@ + + + + + + + FrankRuehl + Frank Ruehl CLM + + + + Guttman Frank + Frank Ruehl CLM + + + + Guttman Frnew + Frank Ruehl CLM + + + Frank Ruehl Frank Ruehl CLM + + + New Peninim MT Frank Ruehl CLM + + + + Frank Ruehl CLM + + serif + + + + + + + he-il + + + serif + + + Frank Ruehl CLM + + + + diff --git a/66-culmus-hadasim-clm.conf b/66-culmus-hadasim-clm.conf new file mode 100644 index 0000000..08882fd --- /dev/null +++ b/66-culmus-hadasim-clm.conf @@ -0,0 +1,17 @@ + + + + + serif + + Hadasim CLM + + + + Hadasim CLM + + serif + + + + diff --git a/66-culmus-keteryg.conf b/66-culmus-keteryg.conf new file mode 100644 index 0000000..0286f8d --- /dev/null +++ b/66-culmus-keteryg.conf @@ -0,0 +1,17 @@ + + + + + serif + + Keter YG + + + + Keter YG + + serif + + + + diff --git a/66-culmus-miriam-clm.conf b/66-culmus-miriam-clm.conf new file mode 100644 index 0000000..73d15cc --- /dev/null +++ b/66-culmus-miriam-clm.conf @@ -0,0 +1,46 @@ + + + + + + + Guttman Miryam + Miriam CLM + + + + Levenim MT + Miriam CLM + + + + Miriam + Miriam CLM + + + + Miriam Transparent + Miriam CLM + + + + Miriam CLM + + sans-serif + + + + + + + he-il + + + sans-serif + + + Miriam CLM + + + + diff --git a/66-culmus-miriam-mono-clm.conf b/66-culmus-miriam-mono-clm.conf new file mode 100644 index 0000000..0cf5c8e --- /dev/null +++ b/66-culmus-miriam-mono-clm.conf @@ -0,0 +1,50 @@ + + + + + + + Fixed Miriam Transparent + Miriam Mono CLM + + + + Guttman Myamfix + Miriam Mono CLM + + + + Guttman-CourMir + Miriam Mono CLM + + + + Miriam Fixed + Miriam Mono CLM + + + Miriam Mono Miriam Mono CLM + + + + + Miriam Mono CLM + + sans-serif + + + + + + + he-il + + + sans-serif + + + Miriam Mono CLM + + + + diff --git a/66-culmus-nachlieli-clm.conf b/66-culmus-nachlieli-clm.conf new file mode 100644 index 0000000..e81863b --- /dev/null +++ b/66-culmus-nachlieli-clm.conf @@ -0,0 +1,33 @@ + + + + + + Nachlieli Nachlieli CLM + + + ArialHB Nachlieli CLM + + + + + Nachlieli CLM + + sans-serif + + + + + + + he-il + + + sans-serif + + + Nachlieli CLM + + + + diff --git a/66-culmus-shofar.conf b/66-culmus-shofar.conf new file mode 100644 index 0000000..032ab31 --- /dev/null +++ b/66-culmus-shofar.conf @@ -0,0 +1,17 @@ + + + + + serif + + Shofar + + + + Shofar + + serif + + + + diff --git a/66-culmus-simple-clm.conf b/66-culmus-simple-clm.conf new file mode 100644 index 0000000..b8f0263 --- /dev/null +++ b/66-culmus-simple-clm.conf @@ -0,0 +1,17 @@ + + + + + sans-serif + + Simple CLM + + + + Simple CLM + + sans-serif + + + + diff --git a/66-culmus-stamashkenaz-clm.conf b/66-culmus-stamashkenaz-clm.conf new file mode 100644 index 0000000..fb6695f --- /dev/null +++ b/66-culmus-stamashkenaz-clm.conf @@ -0,0 +1,17 @@ + + + + + serif + + Stam Ashkenaz CLM + + + + Stam Ashkenaz CLM + + serif + + + + diff --git a/66-culmus-stamsefarad-clm.conf b/66-culmus-stamsefarad-clm.conf new file mode 100644 index 0000000..0fea2a6 --- /dev/null +++ b/66-culmus-stamsefarad-clm.conf @@ -0,0 +1,17 @@ + + + + + serif + + Stam Sefarad CLM + + + + Stam Sefarad CLM + + serif + + + + diff --git a/culmus-fonts.spec b/culmus-fonts.spec index 43ccab3..43c6d27 100644 --- a/culmus-fonts.spec +++ b/culmus-fonts.spec @@ -1,5 +1,6 @@ %global fontname culmus -%global fontconf 65-%{fontname} +%global fontconfd 65-%{fontname} +%global fontconf 66-%{fontname} %global common_desc \ The culmus-fonts package contains fonts for the display of\ @@ -8,7 +9,7 @@ Hebrew from the Culmus project. Name: %{fontname}-fonts Version: 0.130 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Fonts for Hebrew from Culmus project License: GPLv2 @@ -16,7 +17,7 @@ URL: http://culmus.sourceforge.net Source0: http://downloads.sourceforge.net/culmus/%{fontname}-%{version}.tar.gz Source1: %{fontconf}-aharoni-clm.conf Source2: %{fontconf}-caladings-clm.conf -Source3: %{fontconf}-david-clm.conf +Source3: %{fontconfd}-david-clm.conf Source4: %{fontconf}-drugulin-clm.conf Source5: %{fontconf}-ellinia-clm.conf Source6: %{fontconf}-frank-ruehl-clm.conf @@ -93,7 +94,7 @@ Requires: %{name}-common = %{version}-%{release} %description -n %{fontname}-david-clm-fonts %common_desc -%_font_pkg -n david-clm -f %{fontconf}-david-clm.conf DavidCLM-*.ttf DavidCLM-*.afm DavidCLM-*.pfa +%_font_pkg -n david-clm -f %{fontconfd}-david-clm.conf DavidCLM-*.ttf DavidCLM-*.afm DavidCLM-*.pfa %{_datadir}/appdata/%{fontname}-david-clm.metainfo.xml %package -n %{fontname}-drugulin-clm-fonts @@ -340,6 +341,10 @@ install -Dm 0644 -p %{SOURCE66} \ %{_datadir}/appdata/%{fontname}.metainfo.xml %changelog +* Mon Jun 06 2016 Pravin Satpute - 0.130-9 +- Resolved #1217066 : culmus-keteryg-fonts takes over Firefox? +- Update fontconf priority of all fonts from 65 to 66, except David + * Wed Feb 03 2016 Fedora Release Engineering - 0.130-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild