diff --git a/.gitignore b/.gitignore
index 63dc017..5a58872 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ culmus-type1-0.104.tar.gz
/culmus-0.121.tar.gz
/culmus-type1-0.121.tar.gz
/culmus-0.130.tar.gz
+/culmus-0.133.tar.gz
diff --git a/65-clm-david-fonts.conf b/65-clm-david-fonts.conf
new file mode 100644
index 0000000..5daffcc
--- /dev/null
+++ b/65-clm-david-fonts.conf
@@ -0,0 +1,58 @@
+
+
+
+
+
+
+
+
+
+ Guttman Adii
+
+
+ David CLM
+
+
+ Medium Italic
+
+
+
+
+ David Transparent
+ David CLM
+
+
+
+ Guttman David
+ David CLM
+
+
+
+ David David CLM
+ David OT David CLM
+
+
+ Raanana David CLM
+
+
+
+ David CLM
+
+ serif
+
+
+
+
+
+
+ he-il
+
+
+ serif
+
+
+ David CLM
+
+
+
+
diff --git a/65-culmus-david-clm.conf b/65-culmus-david-clm.conf
deleted file mode 100644
index ae7bc59..0000000
--- a/65-culmus-david-clm.conf
+++ /dev/null
@@ -1,58 +0,0 @@
-
-
-
-
-
-
-
-
-
- Guttman Adii
-
-
- David CLM
-
-
- Medium Italic
-
-
-
-
- David Transparent
- David CLM
-
-
-
- Guttman David
- David CLM
-
-
-
- David David CLM
- David OT David CLM
-
-
- Raanana David CLM
-
-
-
- David CLM
-
- serif
-
-
-
-
-
-
- he-il
-
-
- serif
-
-
- David CLM
-
-
-
-
diff --git a/66-clm-aharoni-fonts.conf b/66-clm-aharoni-fonts.conf
new file mode 100644
index 0000000..22d32c2
--- /dev/null
+++ b/66-clm-aharoni-fonts.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-clm-caladings-fonts.conf b/66-clm-caladings-fonts.conf
new file mode 100644
index 0000000..d6bc48e
--- /dev/null
+++ b/66-clm-caladings-fonts.conf
@@ -0,0 +1,16 @@
+
+
+
+
+
+ Caladings Caladings CLM
+
+
+
+ Caladings CLM
+
+ fantasy
+
+
+
+
diff --git a/66-clm-drugulin-fonts.conf b/66-clm-drugulin-fonts.conf
new file mode 100644
index 0000000..3078adf
--- /dev/null
+++ b/66-clm-drugulin-fonts.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-clm-ellinia-fonts.conf b/66-clm-ellinia-fonts.conf
new file mode 100644
index 0000000..141e57b
--- /dev/null
+++ b/66-clm-ellinia-fonts.conf
@@ -0,0 +1,29 @@
+
+
+
+
+
+ Ellinia Ellinia CLM
+
+
+
+ Ellinia CLM
+
+ sans-serif
+
+
+
+
+
+
+ he-il
+
+
+ sans-serif
+
+
+ Ellinia CLM
+
+
+
+
diff --git a/66-clm-frank-ruehl-fonts.conf b/66-clm-frank-ruehl-fonts.conf
new file mode 100644
index 0000000..921057f
--- /dev/null
+++ b/66-clm-frank-ruehl-fonts.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-clm-hadasim-fonts.conf b/66-clm-hadasim-fonts.conf
new file mode 100644
index 0000000..725a755
--- /dev/null
+++ b/66-clm-hadasim-fonts.conf
@@ -0,0 +1,17 @@
+
+
+
+
+ serif
+
+ Hadasim CLM
+
+
+
+ Hadasim CLM
+
+ serif
+
+
+
+
diff --git a/66-clm-keter-yg-fonts.conf b/66-clm-keter-yg-fonts.conf
new file mode 100644
index 0000000..aa3a440
--- /dev/null
+++ b/66-clm-keter-yg-fonts.conf
@@ -0,0 +1,17 @@
+
+
+
+
+ sans-serif
+
+ Keter YG
+
+
+
+ Keter YG
+
+ sans-serif
+
+
+
+
diff --git a/66-clm-miriam-fonts.conf b/66-clm-miriam-fonts.conf
new file mode 100644
index 0000000..9d6e355
--- /dev/null
+++ b/66-clm-miriam-fonts.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-clm-miriam-mono-fonts.conf b/66-clm-miriam-mono-fonts.conf
new file mode 100644
index 0000000..ddddac1
--- /dev/null
+++ b/66-clm-miriam-mono-fonts.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-clm-nachlieli-fonts.conf b/66-clm-nachlieli-fonts.conf
new file mode 100644
index 0000000..f969d14
--- /dev/null
+++ b/66-clm-nachlieli-fonts.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-clm-shofar-fonts.conf b/66-clm-shofar-fonts.conf
new file mode 100644
index 0000000..9588be3
--- /dev/null
+++ b/66-clm-shofar-fonts.conf
@@ -0,0 +1,17 @@
+
+
+
+
+ serif
+
+ Shofar
+
+
+
+ Shofar
+
+ serif
+
+
+
+
diff --git a/66-clm-simple-fonts.conf b/66-clm-simple-fonts.conf
new file mode 100644
index 0000000..e8dac64
--- /dev/null
+++ b/66-clm-simple-fonts.conf
@@ -0,0 +1,17 @@
+
+
+
+
+ sans-serif
+
+ Simple CLM
+
+
+
+ Simple CLM
+
+ sans-serif
+
+
+
+
diff --git a/66-clm-stam-ashkenaz-fonts.conf b/66-clm-stam-ashkenaz-fonts.conf
new file mode 100644
index 0000000..6f85d73
--- /dev/null
+++ b/66-clm-stam-ashkenaz-fonts.conf
@@ -0,0 +1,17 @@
+
+
+
+
+ serif
+
+ Stam Ashkenaz CLM
+
+
+
+ Stam Ashkenaz CLM
+
+ serif
+
+
+
+
diff --git a/66-clm-stam-sefarad-fonts.conf b/66-clm-stam-sefarad-fonts.conf
new file mode 100644
index 0000000..2f767cc
--- /dev/null
+++ b/66-clm-stam-sefarad-fonts.conf
@@ -0,0 +1,17 @@
+
+
+
+
+ serif
+
+ Stam Sefarad CLM
+
+
+
+ Stam Sefarad CLM
+
+ serif
+
+
+
+
diff --git a/66-clm-yehuda-fonts.conf b/66-clm-yehuda-fonts.conf
new file mode 100644
index 0000000..0ef2125
--- /dev/null
+++ b/66-clm-yehuda-fonts.conf
@@ -0,0 +1,17 @@
+
+
+
+
+ sans-serif
+
+ Yehuda CLM
+
+
+
+ Yehuda CLM
+
+ sans-serif
+
+
+
+
diff --git a/66-culmus-aharoni-clm.conf b/66-culmus-aharoni-clm.conf
deleted file mode 100644
index cfb972a..0000000
--- a/66-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/66-culmus-caladings-clm.conf b/66-culmus-caladings-clm.conf
deleted file mode 100644
index 17fd505..0000000
--- a/66-culmus-caladings-clm.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
- Caladings Caladings CLM
-
-
-
- Caladings CLM
-
- fantasy
-
-
-
-
diff --git a/66-culmus-drugulin-clm.conf b/66-culmus-drugulin-clm.conf
deleted file mode 100644
index 6a598fa..0000000
--- a/66-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/66-culmus-ellinia-clm.conf b/66-culmus-ellinia-clm.conf
deleted file mode 100644
index 0b7e922..0000000
--- a/66-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/66-culmus-frank-ruehl-clm.conf b/66-culmus-frank-ruehl-clm.conf
deleted file mode 100644
index 6bae077..0000000
--- a/66-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/66-culmus-hadasim-clm.conf b/66-culmus-hadasim-clm.conf
deleted file mode 100644
index 08882fd..0000000
--- a/66-culmus-hadasim-clm.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
- serif
-
- Hadasim CLM
-
-
-
- Hadasim CLM
-
- serif
-
-
-
-
diff --git a/66-culmus-keteryg.conf b/66-culmus-keteryg.conf
deleted file mode 100644
index 0286f8d..0000000
--- a/66-culmus-keteryg.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
- serif
-
- Keter YG
-
-
-
- Keter YG
-
- serif
-
-
-
-
diff --git a/66-culmus-miriam-clm.conf b/66-culmus-miriam-clm.conf
deleted file mode 100644
index 73d15cc..0000000
--- a/66-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/66-culmus-miriam-mono-clm.conf b/66-culmus-miriam-mono-clm.conf
deleted file mode 100644
index 0cf5c8e..0000000
--- a/66-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/66-culmus-nachlieli-clm.conf b/66-culmus-nachlieli-clm.conf
deleted file mode 100644
index e81863b..0000000
--- a/66-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/66-culmus-shofar.conf b/66-culmus-shofar.conf
deleted file mode 100644
index 032ab31..0000000
--- a/66-culmus-shofar.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
- serif
-
- Shofar
-
-
-
- Shofar
-
- serif
-
-
-
-
diff --git a/66-culmus-simple-clm.conf b/66-culmus-simple-clm.conf
deleted file mode 100644
index b8f0263..0000000
--- a/66-culmus-simple-clm.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
- sans-serif
-
- Simple CLM
-
-
-
- Simple CLM
-
- sans-serif
-
-
-
-
diff --git a/66-culmus-stamashkenaz-clm.conf b/66-culmus-stamashkenaz-clm.conf
deleted file mode 100644
index fb6695f..0000000
--- a/66-culmus-stamashkenaz-clm.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
- serif
-
- Stam Ashkenaz CLM
-
-
-
- Stam Ashkenaz CLM
-
- serif
-
-
-
-
diff --git a/66-culmus-stamsefarad-clm.conf b/66-culmus-stamsefarad-clm.conf
deleted file mode 100644
index 0fea2a6..0000000
--- a/66-culmus-stamsefarad-clm.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
- serif
-
- Stam Sefarad CLM
-
-
-
- Stam Sefarad CLM
-
- serif
-
-
-
-
diff --git a/culmus-aharoni-clm.metainfo.xml b/culmus-aharoni-clm.metainfo.xml
deleted file mode 100644
index 28fb574..0000000
--- a/culmus-aharoni-clm.metainfo.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
- culmus-aharoni-clm
- CC-BY-3.0
- culmus
-
diff --git a/culmus-caladings-clm.metainfo.xml b/culmus-caladings-clm.metainfo.xml
deleted file mode 100644
index 4c3ef24..0000000
--- a/culmus-caladings-clm.metainfo.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
- culmus-caladings-clm
- CC-BY-3.0
- culmus
-
diff --git a/culmus-david-clm.metainfo.xml b/culmus-david-clm.metainfo.xml
deleted file mode 100644
index 721264a..0000000
--- a/culmus-david-clm.metainfo.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
- culmus-david-clm
- CC-BY-3.0
- culmus
-
diff --git a/culmus-drugulin-clm.metainfo.xml b/culmus-drugulin-clm.metainfo.xml
deleted file mode 100644
index b8dfd66..0000000
--- a/culmus-drugulin-clm.metainfo.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
- culmus-drugulin-clm
- CC-BY-3.0
- culmus
-
diff --git a/culmus-ellinia-clm.metainfo.xml b/culmus-ellinia-clm.metainfo.xml
deleted file mode 100644
index 900b767..0000000
--- a/culmus-ellinia-clm.metainfo.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
- culmus-ellinia-clm
- CC-BY-3.0
- culmus
-
diff --git a/culmus-fonts.spec b/culmus-fonts.spec
index 3e0d830..222e960 100644
--- a/culmus-fonts.spec
+++ b/culmus-fonts.spec
@@ -1,346 +1,318 @@
-%global fontname culmus
-%global fontconfd 65-%{fontname}
-%global fontconf 66-%{fontname}
-
-%global common_desc \
-The culmus-fonts package contains fonts for the display of\
-Hebrew from the Culmus project.
-
-
-Name: %{fontname}-fonts
-Version: 0.130
-Release: 18%{?dist}
-Summary: Fonts for Hebrew from Culmus project
-
-License: GPLv2
-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: %{fontconfd}-david-clm.conf
-Source4: %{fontconf}-drugulin-clm.conf
-Source5: %{fontconf}-ellinia-clm.conf
-Source6: %{fontconf}-frank-ruehl-clm.conf
-Source7: %{fontconf}-miriam-clm.conf
-Source8: %{fontconf}-miriam-mono-clm.conf
-Source9: %{fontconf}-nachlieli-clm.conf
-Source10: %{fontconf}-hadasim-clm.conf
-Source11: %{fontconf}-keteryg.conf
-Source12: %{fontconf}-simple-clm.conf
-Source13: %{fontconf}-stamashkenaz-clm.conf
-Source14: %{fontconf}-stamsefarad-clm.conf
-Source15: %{fontconf}-shofar.conf
-Source16: http://downloads.sourceforge.net/culmus/culmus-type1-0.121.tar.gz
-Obsoletes: culmus-fonts < 0.102-1
-
-#for appstream metainfo
-Source50: %{fontname}-aharoni-clm.metainfo.xml
-Source51: %{fontname}-caladings-clm.metainfo.xml
-Source52: %{fontname}-david-clm.metainfo.xml
-Source53: %{fontname}-drugulin-clm.metainfo.xml
-Source54: %{fontname}-ellinia-clm.metainfo.xml
-Source55: %{fontname}-frank-ruehl-clm.metainfo.xml
-Source56: %{fontname}-hadasim-clm.metainfo.xml
-Source57: %{fontname}-keteryg.metainfo.xml
-Source58: %{fontname}-miriam-clm.metainfo.xml
-Source59: %{fontname}-miriam-mono-clm.metainfo.xml
-Source60: %{fontname}-nachlieli-clm.metainfo.xml
-Source61: %{fontname}-simple-clm.metainfo.xml
-Source62: %{fontname}-stamashkenaz-clm.metainfo.xml
-Source63: %{fontname}-stamsefarad-clm.metainfo.xml
-Source64: %{fontname}-yehuda-clm.metainfo.xml
-Source65: %{fontname}-shofar.metainfo.xml
-Source66: %{fontname}.metainfo.xml
-
-BuildArch: noarch
-BuildRequires: fontpackages-devel
-
+BuildArch: noarch
+BuildRequires: /usr/bin/makeotfexe
+BuildRequires: fontforge
+
+Version: 0.133
+Release: 1%{?dist}
+License: GPLv2
+URL: http://culmus.sourceforge.net
+
+%global common_description %{expand:
+The culmus-fonts package contains fonts for the display of
+Hebrew from the Culmus project.}
+
+%global foundry CLM
+%global fontlicenses LICENSE GNU-GPL LICENSE LICENSE-BITSTREAM
+%global fontdocs CHANGES
+%global fontdocsex %{fontlicenses}
+
+Source0: http://downloads.sourceforge.net/culmus/culmus-%{version}.tar.gz
+Source1: 66-%{fontpkgname1}.conf
+Source2: 66-%{fontpkgname2}.conf
+Source3: 65-%{fontpkgname3}.conf
+Source4: 66-%{fontpkgname4}.conf
+Source5: 66-%{fontpkgname5}.conf
+Source6: 66-%{fontpkgname6}.conf
+Source7: 66-%{fontpkgname7}.conf
+Source8: 66-%{fontpkgname8}.conf
+Source9: 66-%{fontpkgname9}.conf
+Source10: 66-%{fontpkgname10}.conf
+Source11: 66-%{fontpkgname11}.conf
+Source12: 66-%{fontpkgname12}.conf
+Source13: 66-%{fontpkgname13}.conf
+Source14: 66-%{fontpkgname14}.conf
+Source15: 66-%{fontpkgname15}.conf
+Source16: 66-%{fontpkgname16}.conf
+Source17: modify-font-metadata.pe
+
+Name: culmus-fonts
+Summary: Fonts for Hebrew from Culmus project
%description
-%common_desc
-Meta-package of Culmus fonts which installs various families of culmus project.
-
-%package common
-Summary: Common files of culmus-fonts
-Requires: fontpackages-filesystem
-%description common
-%common_desc
-
-This package consists of files used by other %{name} packages.
-
-%package -n %{fontname}-aharoni-clm-fonts
-Summary: Fonts for Hebrew from Culmus project
-Requires: %{name}-common = %{version}-%{release}
-
-%description -n %{fontname}-aharoni-clm-fonts
-%common_desc
-
-%_font_pkg -n aharoni-clm -f %{fontconf}-aharoni-clm.conf AharoniCLM-*.afm AharoniCLM-*.pfa
-%{_datadir}/appdata/%{fontname}-aharoni-clm.metainfo.xml
-
-%package -n %{fontname}-caladings-clm-fonts
-Summary: Fonts for Hebrew from Culmus project
-Requires: %{name}-common = %{version}-%{release}
-
-%description -n %{fontname}-caladings-clm-fonts
-%common_desc
-
-%_font_pkg -n caladings-clm -f %{fontconf}-caladings-clm.conf CaladingsCLM.afm CaladingsCLM.pfa
-%{_datadir}/appdata/%{fontname}-caladings-clm.metainfo.xml
-
-%package -n %{fontname}-david-clm-fonts
-Summary: Fonts for Hebrew from Culmus project
-Requires: %{name}-common = %{version}-%{release}
-
-%description -n %{fontname}-david-clm-fonts
-%common_desc
-
-%_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
-Summary: Fonts for Hebrew from Culmus project
-Requires: %{name}-common = %{version}-%{release}
-
-%description -n %{fontname}-drugulin-clm-fonts
-%common_desc
-
-%_font_pkg -n drugulin-clm -f %{fontconf}-drugulin-clm.conf DrugulinCLM-*.afm DrugulinCLM-*.pfa
-%{_datadir}/appdata/%{fontname}-drugulin-clm.metainfo.xml
-
-%package -n %{fontname}-ellinia-clm-fonts
-Summary: Fonts for Hebrew from Culmus project
-Requires: %{name}-common = %{version}-%{release}
-
-%description -n %{fontname}-ellinia-clm-fonts
-%common_desc
-
-%_font_pkg -n ellinia-clm -f %{fontconf}-ellinia-clm.conf ElliniaCLM-*.afm ElliniaCLM-*.pfa
-%{_datadir}/appdata/%{fontname}-ellinia-clm.metainfo.xml
-
-%package -n %{fontname}-frank-ruehl-clm-fonts
-Summary: Fonts for Hebrew from Culmus project
-Requires: %{name}-common = %{version}-%{release}
-
-%description -n %{fontname}-frank-ruehl-clm-fonts
-%common_desc
-
-%_font_pkg -n frank-ruehl-clm -f %{fontconf}-frank-ruehl-clm.conf FrankRuehlCLM-*.ttf FrankRuehlCLM-*.afm FrankRuehlCLM-*.pfa
-%{_datadir}/appdata/%{fontname}-frank-ruehl-clm.metainfo.xml
-
-
-%package -n %{fontname}-hadasim-clm-fonts
-Summary: Fonts for Hebrew from Culmus project
-Requires: %{name}-common = %{version}-%{release}
-
-%description -n %{fontname}-hadasim-clm-fonts
-%common_desc
-
-%_font_pkg -n hadasim-clm -f %{fontconf}-hadasim-clm.conf HadasimCLM-*.ttf
-%{_datadir}/appdata/%{fontname}-hadasim-clm.metainfo.xml
-
-%package -n %{fontname}-keteryg-fonts
-Summary: Fonts for Hebrew from Culmus project
-Requires: %{name}-common = %{version}-%{release}
-
-%description -n %{fontname}-keteryg-fonts
-%common_desc
-
-%_font_pkg -n keteryg -f %{fontconf}-keteryg.conf KeterYG-*.ttf
-%{_datadir}/appdata/%{fontname}-keteryg.metainfo.xml
-
-
-%package -n %{fontname}-miriam-clm-fonts
-Summary: Fonts for Hebrew from Culmus project
-Requires: %{name}-common = %{version}-%{release}
-
-%description -n %{fontname}-miriam-clm-fonts
-%common_desc
-
-%_font_pkg -n miriam-clm -f %{fontconf}-miriam-clm.conf MiriamCLM-*.ttf MiriamCLM-*.afm MiriamCLM-*.pfa
-%{_datadir}/appdata/%{fontname}-miriam-clm.metainfo.xml
-
-%package -n %{fontname}-miriam-mono-clm-fonts
-Summary: Fonts for Hebrew from Culmus project
-Requires: %{name}-common = %{version}-%{release}
-
-%description -n %{fontname}-miriam-mono-clm-fonts
-%common_desc
-
-%_font_pkg -n miriam-mono-clm -f %{fontconf}-miriam-mono-clm.conf MiriamMonoCLM-*.ttf MiriamMonoCLM-*.afm MiriamMonoCLM-*.pfa
-%{_datadir}/appdata/%{fontname}-miriam-mono-clm.metainfo.xml
-
-%package -n %{fontname}-nachlieli-clm-fonts
-Summary: Fonts for Hebrew from Culmus project
-Requires: %{name}-common = %{version}-%{release}
-
-%description -n %{fontname}-nachlieli-clm-fonts
-%common_desc
-
-%_font_pkg -n nachlieli-clm -f %{fontconf}-nachlieli-clm.conf NachlieliCLM-*.afm NachlieliCLM-*.pfa
-%{_datadir}/appdata/%{fontname}-nachlieli-clm.metainfo.xml
-
-
-%package -n %{fontname}-simple-clm-fonts
-Summary: Fonts for Hebrew from Culmus project
-Requires: %{name}-common = %{version}-%{release}
-
-%description -n %{fontname}-simple-clm-fonts
-%common_desc
-
-%_font_pkg -n simple-clm -f %{fontconf}-simple-clm.conf SimpleCLM-*.ttf
-%{_datadir}/appdata/%{fontname}-simple-clm.metainfo.xml
-
-%package -n %{fontname}-stamashkenaz-clm-fonts
-Summary: Fonts for Hebrew from Culmus project
-Requires: %{name}-common = %{version}-%{release}
-
-%description -n %{fontname}-stamashkenaz-clm-fonts
-%common_desc
-
-%_font_pkg -n stamashkenaz-clm -f %{fontconf}-stamashkenaz-clm.conf StamAshkenazCLM.ttf
-%{_datadir}/appdata/%{fontname}-stamashkenaz-clm.metainfo.xml
-
-%package -n %{fontname}-stamsefarad-clm-fonts
-Summary: Fonts for Hebrew from Culmus project
-Requires: %{name}-common = %{version}-%{release}
-
-%description -n %{fontname}-stamsefarad-clm-fonts
-%common_desc
-
-%_font_pkg -n stamsefarad-clm -f %{fontconf}-stamsefarad-clm.conf StamSefaradCLM.ttf
-%{_datadir}/appdata/%{fontname}-stamsefarad-clm.metainfo.xml
-
-
-%package -n %{fontname}-yehuda-clm-fonts
-Summary: Fonts for Hebrew from Culmus project
-Requires: %{name}-common = %{version}-%{release}
-
-%description -n %{fontname}-yehuda-clm-fonts
-%common_desc
-
-%_font_pkg -n yehuda-clm YehudaCLM-*.afm YehudaCLM-*.pfa
-%{_datadir}/appdata/%{fontname}-yehuda-clm.metainfo.xml
-
-%package -n %{fontname}-shofar-fonts
-Summary: Fonts for Hebrew from Culmus project
-Requires: %{name}-common = %{version}-%{release}
-
-%description -n %{fontname}-shofar-fonts
-%common_desc
-
-%_font_pkg -n shofar -f %{fontconf}-shofar.conf Shofar*.ttf
-%{_datadir}/appdata/%{fontname}-shofar.metainfo.xml
+%wordwrap -v common_description
+
+
+%global fontfamily1 Aharoni CLM
+%global fontsummary1 Aharoni CLM, a sans-serif font family
+%global fontpkgheader1 %{expand:
+Obsoletes: culmus-aharoni-clm-fonts < 0.130-17
+Provides: culmus-aharoni-clm-fonts = %{version}-%{release}
+}
+%global fonts1 AharoniCLM-*.otf
+%global fontconfs1 %{SOURCE1}
+%global fontdescription1 %{expand:
+%{common_description}
+
+This package provides Aharoni CLM, a sans-serif font family.
+}
+
+%global fontfamily2 Caladings CLM
+%global fontsummary2 Caladings CLM, a fantasy font family
+%global fontpkgheader2 %{expand:
+Obsoletes: culmus-caladings-clm-fonts < 0.130-17
+Provides: culmus-caladings-clm-fonts = %{version}-%{release}
+}
+%global fonts2 CaladingsCLM.otf
+%global fontconfs2 %{SOURCE2}
+%global fontdescription2 %{expand:
+%{common_description}
+
+This package provides Caladings CLM, a fantasy font family.
+}
+
+%global fontfamily3 David CLM
+%global fontsummary3 David CLM, a serif font family
+%global fontpkgheader3 %{expand:
+Obsoletes: culmus-david-clm-fonts < 0.130-17
+Provides: culmus-david-clm-fonts = %{version}-%{release}
+}
+%global fonts3 DavidCLM-*.otf
+%global fontconfs3 %{SOURCE3}
+%global fontdescription3 %{expand:
+%{common_description}
+
+This package provides David CLM, a serif font family.
+}
+
+%global fontfamily4 Drugulin CLM
+%global fontsummary4 Drugulin CLM, a serif font family
+%global fontpkgheader4 %{expand:
+Obsoletes: culmus-drugulin-clm-fonts < 0.130-17
+Provides: culmus-drugulin-clm-fonts = %{version}-%{release}
+
+}
+%global fonts4 DrugulinCLM-*.otf
+%global fontconfs4 %{SOURCE4}
+%global fontdescription4 %{expand:
+%{common_description}
+
+This package provides Drugulin CLM, a serif font family.
+}
+
+%global fontfamily5 Ellinia CLM
+%global fontsummary5 Ellinia CLM, a sans-serif font family
+%global fontpkgheader5 %{expand:
+Obsoletes: culmus-ellinia-clm-fonts < 0.130-17
+Provides: culmus-ellinia-clm-fonts = %{version}-%{release}
+
+}
+%global fonts5 ElliniaCLM-*.otf
+%global fontconfs5 %{SOURCE5}
+%global fontdescription5 %{expand:
+%{common_description}
+
+This package provides Ellinia CLM, a sans-serif font family.
+}
+
+%global fontfamily6 Frank Ruehl CLM
+%global fontsummary6 Frank Ruehl CLM, a serif font family
+%global fontpkgheader6 %{expand:
+Obsoletes: culmus-frank-ruehl-clm-fonts < 0.130-17
+Provides: culmus-frank-ruehl-clm-fonts = %{version}-%{release}
+}
+%global fonts6 FrankRuehlCLM-*.ttf
+%global fontconfs6 %{SOURCE6}
+%global fontdescription6 %{expand:
+%{common_description}
+
+This package provides Frank Ruehl CLM, a serif font family.
+}
+
+%global fontfamily7 Hadasim CLM
+%global fontsummary7 Hadasim CLM, a serif font family
+%global fontpkgheader7 %{expand:
+Obsoletes: culmus-hadasim-clm-fonts < 0.130-17
+Provides: culmus-hadasim-clm-fonts = %{version}-%{release}
+}
+%global fonts7 HadasimCLM-*.ttf
+%global fontconfs7 %{SOURCE7}
+%global fontdescription7 %{expand:
+%{common_description}
+
+This package provides Hadasim CLM, a serif font family.
+}
+
+%global fontfamily8 Keter YG
+%global fontsummary8 Keter YG, a sans-serif font family
+%global fontpkgheader8 %{expand:
+Obsoletes: culmus-keteryg-fonts < 0.130-17
+Provides: culmus-keteryg-fonts = %{version}-%{release}
+}
+%global fonts8 KeterYG-*.ttf
+%global fontconfs8 %{SOURCE8}
+%global fontdescription8 %{expand:
+%{common_description}
+
+This package provides Keter YG, a sans-serif font family.
+}
+
+%global fontfamily9 Miriam CLM
+%global fontsummary9 Miriam CLM, a sans-serif font family
+%global fontpkgheader9 %{expand:
+Obsoletes: culmus-miriam-clm-fonts < 0.130-17
+Provides: culmus-miriam-clm-fonts = %{version}-%{release}
+}
+%global fonts9 MiriamCLM-*.ttf
+%global fontconfs9 %{SOURCE9}
+%global fontdescription9 %{expand:
+%{common_description}
+
+This package provides Miriam CLM, a sans-serif font family.
+}
+
+%global fontfamily10 Miriam Mono CLM
+%global fontsummary10 Miriam Mono CLM, a monospace font family
+%global fontpkgheader10 %{expand:
+Obsoletes: culmus-miriam-mono-clm-fonts < 0.130-17
+Provides: culmus-miriam-mono-clm-fonts = %{version}-%{release}
+}
+%global fonts10 MiriamMonoCLM-*.ttf
+%global fontconfs10 %{SOURCE10}
+%global fontdescription10 %{expand:
+%{common_description}
+
+This package provides Miriam Mono CLM, a monospace font family.
+}
+
+%global fontfamily11 Nachlieli CLM
+%global fontsummary11 Nachlieli CLM, a sans-serif font family
+%global fontpkgheader11 %{expand:
+Obsoletes: culmus-nachlieli-clm-fonts < 0.130-17
+Provides: culmus-nachlieli-clm-fonts = %{version}-%{release}
+}
+%global fonts11 NachlieliCLM-*.otf
+%global fontconfs11 %{SOURCE11}
+%global fontdescription11 %{expand:
+%{common_description}
+
+This package provides Nachlieli CLM, a sans-serif font family.
+}
+
+%global fontfamily12 Shofar
+%global fontsummary12 Shofar, a serif font family
+%global fontpkgheader12 %{expand:
+Obsoletes: culmus-shofar-clm-fonts < 0.130-17
+Provides: culmus-shofar-clm-fonts = %{version}-%{release}
+}
+%global fonts12 Shofar*.ttf
+%global fontconfs12 %{SOURCE12}
+%global fontdescription12 %{expand:
+%{common_description}
+
+This package provides Shofar, a serif font family.
+}
+
+%global fontfamily13 Simple CLM
+%global fontsummary13 Simple CLM, a sans-serif font family
+%global fontpkgheader13 %{expand:
+Obsoletes: culmus-simple-clm-fonts < 0.130-17
+Provides: culmus-simple-clm-fonts = %{version}-%{release}
+}
+%global fonts13 SimpleCLM-*.ttf
+%global fontconfs13 %{SOURCE13}
+%global fontdescription13 %{expand:
+%{common_description}
+
+This package provides Simple CLM, a sans-serif font family.
+}
+
+%global fontfamily14 Stam Ashkenaz CLM
+%global fontsummary14 Stam Ashkenaz CLM, a serif font family
+%global fontpkgheader14 %{expand:
+Obsoletes: culmus-stamashkenaz-clm-fonts < 0.130-17
+Provides: culmus-stamashkenaz-clm-fonts = %{version}-%{release}
+}
+%global fonts14 StamAshkenazCLM.ttf
+%global fontconfs14 %{SOURCE14}
+%global fontdescription14 %{expand:
+%{common_description}
+
+This package provides Stam Ashkenaz CLM, a serif font family.
+}
+
+%global fontfamily15 Stam Sefarad CLM
+%global fontsummary15 Stam Sefarad CLM, a serif font family
+%global fontpkgheader15 %{expand:
+Obsoletes: culmus-stamsefarad-clm-fonts < 0.130-17
+Provides: culmus-stamsefarad-clm-fonts = %{version}-%{release}
+}
+%global fonts15 StamSefaradCLM.ttf
+%global fontconfs15 %{SOURCE15}
+%global fontdescription15 %{expand:
+%{common_description}
+
+This package provides Stam Sefarad CLM, a serif font family.
+}
+
+%global fontfamily16 Yehuda CLM
+%global fontsummary16 Yehuda CLM, a sans-serif font family
+%global fontpkgheader16 %{expand:
+Obsoletes: culmus-yehuda-clm-fonts < 0.130-17
+Provides: culmus-yehuda-clm-fonts = %{version}-%{release}
+}
+%global fonts16 YehudaCLM-*.otf
+%global fontconfs16 %{SOURCE16}
+%global fontdescription16 %{expand:
+%{common_description}
+
+This package provides Yehuda CLM, a sans-serif font family.
+}
+
+
+%fontpkg -a
+
+%fontmetapkg
%prep
-%setup -q -n %{fontname}-%{version}
-%setup -c -q -a 16
-mv %{fontname}-%{version}/* .
-mv %{fontname}-type1-0.121/* .
+%setup -q -n culmus-%{version}
+cp -p %{SOURCE17} .
%build
+# As per fonts packaging guidelines we cannot install non-opentype fonts
+# hence lets use makeotf tool to convert them to otf type format
+makeotfexe -f AharoniCLM-BoldOblique.pfa -b
+makeotfexe -f AharoniCLM-Bold.pfa -b
+makeotfexe -f AharoniCLM-BookOblique.pfa
+makeotfexe -f AharoniCLM-Book.pfa
+makeotfexe -f CaladingsCLM.pfa
+makeotfexe -f DrugulinCLM-BoldItalic.pfa -bi
+makeotfexe -f DrugulinCLM-Bold.pfa -b
+makeotfexe -f ElliniaCLM-BoldItalic.pfa -bi
+makeotfexe -f ElliniaCLM-Bold.pfa -b
+makeotfexe -f ElliniaCLM-LightItalic.pfa -i
+makeotfexe -f ElliniaCLM-Light.pfa
+makeotfexe -f YehudaCLM-Bold.pfa -b
+makeotfexe -f YehudaCLM-Light.pfa
+
+fontforge ./modify-font-metadata.pe
+
+%fontbuild -a
%install
+%fontinstall -a
+
+%check
+%fontcheck -a
-install -m 0755 -d %{buildroot}%{_fontdir}
-install -m 0644 -p *.ttf %{buildroot}%{_fontdir}
-install -m 0644 -p *.afm %{buildroot}%{_fontdir}
-install -m 0644 -p *.pfa %{buildroot}%{_fontdir}
-
-install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
- %{buildroot}%{_fontconfig_confdir}
-
-install -m 0644 -p %{SOURCE1} \
- %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-aharoni-clm.conf
-install -m 0644 -p %{SOURCE2} \
- %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-caladings-clm.conf
-install -m 0644 -p %{SOURCE3} \
- %{buildroot}%{_fontconfig_templatedir}/%{fontconfd}-david-clm.conf
-install -m 0644 -p %{SOURCE4} \
- %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-drugulin-clm.conf
-install -m 0644 -p %{SOURCE5} \
- %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-ellinia-clm.conf
-install -m 0644 -p %{SOURCE6} \
- %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-frank-ruehl-clm.conf
-install -m 0644 -p %{SOURCE7} \
- %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-miriam-clm.conf
-install -m 0644 -p %{SOURCE8} \
- %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-miriam-mono-clm.conf
-install -m 0644 -p %{SOURCE9} \
- %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-nachlieli-clm.conf
-install -m 0644 -p %{SOURCE10} \
- %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-hadasim-clm.conf
-install -m 0644 -p %{SOURCE11} \
- %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-keteryg.conf
-install -m 0644 -p %{SOURCE12} \
- %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-simple-clm.conf
-install -m 0644 -p %{SOURCE13} \
- %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-stamashkenaz-clm.conf
-install -m 0644 -p %{SOURCE14} \
- %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-stamsefarad-clm.conf
-install -m 0644 -p %{SOURCE15} \
- %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-shofar.conf
-
-for fconf in %{fontconf}-aharoni-clm.conf \
- %{fontconf}-caladings-clm.conf \
- %{fontconfd}-david-clm.conf \
- %{fontconf}-drugulin-clm.conf \
- %{fontconf}-ellinia-clm.conf \
- %{fontconf}-frank-ruehl-clm.conf \
- %{fontconf}-miriam-clm.conf \
- %{fontconf}-miriam-mono-clm.conf \
- %{fontconf}-nachlieli-clm.conf \
- %{fontconf}-hadasim-clm.conf \
- %{fontconf}-keteryg.conf \
- %{fontconf}-simple-clm.conf \
- %{fontconf}-stamashkenaz-clm.conf \
- %{fontconf}-stamsefarad-clm.conf \
- %{fontconf}-shofar.conf ; do
- ln -s %{_fontconfig_templatedir}/$fconf \
- %{buildroot}%{_fontconfig_confdir}/$fconf
-done
-
-# Add AppStream metadata
-install -Dm 0644 -p %{SOURCE50} \
- %{buildroot}%{_datadir}/appdata/%{fontname}-aharoni-clm.metainfo.xml
-install -Dm 0644 -p %{SOURCE51} \
- %{buildroot}%{_datadir}/appdata/%{fontname}-caladings-clm.metainfo.xml
-install -Dm 0644 -p %{SOURCE52} \
- %{buildroot}%{_datadir}/appdata/%{fontname}-david-clm.metainfo.xml
-install -Dm 0644 -p %{SOURCE53} \
- %{buildroot}%{_datadir}/appdata/%{fontname}-drugulin-clm.metainfo.xml
-install -Dm 0644 -p %{SOURCE54} \
- %{buildroot}%{_datadir}/appdata/%{fontname}-ellinia-clm.metainfo.xml
-install -Dm 0644 -p %{SOURCE55} \
- %{buildroot}%{_datadir}/appdata/%{fontname}-frank-ruehl-clm.metainfo.xml
-install -Dm 0644 -p %{SOURCE56} \
- %{buildroot}%{_datadir}/appdata/%{fontname}-hadasim-clm.metainfo.xml
-install -Dm 0644 -p %{SOURCE57} \
- %{buildroot}%{_datadir}/appdata/%{fontname}-keteryg.metainfo.xml
-install -Dm 0644 -p %{SOURCE58} \
- %{buildroot}%{_datadir}/appdata/%{fontname}-miriam-clm.metainfo.xml
-install -Dm 0644 -p %{SOURCE59} \
- %{buildroot}%{_datadir}/appdata/%{fontname}-miriam-mono-clm.metainfo.xml
-install -Dm 0644 -p %{SOURCE60} \
- %{buildroot}%{_datadir}/appdata/%{fontname}-nachlieli-clm.metainfo.xml
-install -Dm 0644 -p %{SOURCE61} \
- %{buildroot}%{_datadir}/appdata/%{fontname}-simple-clm.metainfo.xml
-install -Dm 0644 -p %{SOURCE62} \
- %{buildroot}%{_datadir}/appdata/%{fontname}-stamashkenaz-clm.metainfo.xml
-install -Dm 0644 -p %{SOURCE63} \
- %{buildroot}%{_datadir}/appdata/%{fontname}-stamsefarad-clm.metainfo.xml
-install -Dm 0644 -p %{SOURCE64} \
- %{buildroot}%{_datadir}/appdata/%{fontname}-yehuda-clm.metainfo.xml
-install -Dm 0644 -p %{SOURCE65} \
- %{buildroot}%{_datadir}/appdata/%{fontname}-shofar.metainfo.xml
-install -Dm 0644 -p %{SOURCE66} \
- %{buildroot}%{_datadir}/appdata/%{fontname}.metainfo.xml
-
-
-%files common
-%doc CHANGES GNU-GPL LICENSE LICENSE-BITSTREAM
-%{_datadir}/appdata/%{fontname}.metainfo.xml
+%fontfiles -a
%changelog
+* Tue Jun 15 2021 Parag Nemade - 0.133-1
+- Update to 0.133 release
+- Convert to new fonts packaging guidelines
+- Dropped *.afm font files
+- Converted *.pfa font files to *.otf format using makeotfexe tool
+- Drop Obsoletes: culmus-fonts
+
* Tue Jan 26 2021 Fedora Release Engineering - 0.130-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
diff --git a/culmus-frank-ruehl-clm.metainfo.xml b/culmus-frank-ruehl-clm.metainfo.xml
deleted file mode 100644
index b3a8618..0000000
--- a/culmus-frank-ruehl-clm.metainfo.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
- culmus-frank-ruehl-clm
- CC-BY-3.0
- culmus
-
diff --git a/culmus-hadasim-clm.metainfo.xml b/culmus-hadasim-clm.metainfo.xml
deleted file mode 100644
index 142bd60..0000000
--- a/culmus-hadasim-clm.metainfo.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
- culmus-hadasim-clm
- CC-BY-3.0
- culmus
-
diff --git a/culmus-keteryg.metainfo.xml b/culmus-keteryg.metainfo.xml
deleted file mode 100644
index 07f8645..0000000
--- a/culmus-keteryg.metainfo.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
- culmus-keteryg
- CC-BY-3.0
- culmus
-
diff --git a/culmus-miriam-clm.metainfo.xml b/culmus-miriam-clm.metainfo.xml
deleted file mode 100644
index a5742e0..0000000
--- a/culmus-miriam-clm.metainfo.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
- culmus-miriam-clm
- CC-BY-3.0
- culmus
-
diff --git a/culmus-miriam-mono-clm.metainfo.xml b/culmus-miriam-mono-clm.metainfo.xml
deleted file mode 100644
index 15f08de..0000000
--- a/culmus-miriam-mono-clm.metainfo.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
- culmus-miriam-mono-clm
- CC-BY-3.0
- culmus
-
diff --git a/culmus-nachlieli-clm.metainfo.xml b/culmus-nachlieli-clm.metainfo.xml
deleted file mode 100644
index a065173..0000000
--- a/culmus-nachlieli-clm.metainfo.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
- culmus-nachlieli-clm
- CC-BY-3.0
- culmus
-
diff --git a/culmus-shofar.metainfo.xml b/culmus-shofar.metainfo.xml
deleted file mode 100644
index 54579be..0000000
--- a/culmus-shofar.metainfo.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
- culmus-shofar
- CC-BY-3.0
- culmus
-
diff --git a/culmus-simple-clm.metainfo.xml b/culmus-simple-clm.metainfo.xml
deleted file mode 100644
index 837f69c..0000000
--- a/culmus-simple-clm.metainfo.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
- culmus-simple-clm
- CC-BY-3.0
- culmus
-
diff --git a/culmus-stamashkenaz-clm.metainfo.xml b/culmus-stamashkenaz-clm.metainfo.xml
deleted file mode 100644
index 3251e59..0000000
--- a/culmus-stamashkenaz-clm.metainfo.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
- culmus-stamashkenaz-clm
- CC-BY-3.0
- culmus
-
diff --git a/culmus-stamsefarad-clm.metainfo.xml b/culmus-stamsefarad-clm.metainfo.xml
deleted file mode 100644
index 2bd3287..0000000
--- a/culmus-stamsefarad-clm.metainfo.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
- culmus-stamsefarad-clm
- CC-BY-3.0
- culmus
-
diff --git a/culmus-yehuda-clm.metainfo.xml b/culmus-yehuda-clm.metainfo.xml
deleted file mode 100644
index 9dc51e7..0000000
--- a/culmus-yehuda-clm.metainfo.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
- culmus-yehuda-clm
- CC-BY-3.0
- culmus
-
diff --git a/modify-font-metadata.pe b/modify-font-metadata.pe
new file mode 100755
index 0000000..8d542c2
--- /dev/null
+++ b/modify-font-metadata.pe
@@ -0,0 +1,112 @@
+#!/usr/bin/fontforge
+
+Open('./AharoniCLM-BookOblique.otf')
+SetTTFName(0x409, 4, 'AharoniCLM Oblique')
+SetTTFName(0x409, 17, 'Oblique')
+Generate('./AharoniCLM-BookOblique.otf')
+Close()
+Open('./AharoniCLM-BoldOblique.otf')
+SetTTFName(0x409, 4, 'AharoniCLM Bold Oblique')
+SetTTFName(0x409, 17, 'Bold Oblique')
+Generate('./AharoniCLM-BoldOblique.otf')
+Close()
+Open('./DavidCLM-MediumItalic.otf')
+SetTTFName(0x409, 2, 'Medium Italic')
+Generate('./DavidCLM-MediumItalic.otf')
+Close()
+Open('./DavidCLM-BoldItalic.otf')
+SetTTFName(0x409, 2, 'Bold Italic')
+Generate('./DavidCLM-BoldItalic.otf')
+Close()
+Open('./DrugulinCLM-BoldItalic.otf')
+SetTTFName(0x409, 4, 'DrugulinCLM Bold Italic')
+SetTTFName(0x409, 17, 'Bold Italic')
+Generate('./DrugulinCLM-BoldItalic.otf')
+Close()
+Open('./ElliniaCLM-BoldItalic.otf')
+SetTTFName(0x409, 4, 'ElliniaCLM Bold Italic')
+SetTTFName(0x409, 17, 'Bold Italic')
+Generate('./ElliniaCLM-BoldItalic.otf')
+Close()
+Open('./FrankRuehlCLM-BoldOblique.ttf')
+SetTTFName(0x409, 2, 'Bold Oblique')
+Generate('./FrankRuehlCLM-BoldOblique.ttf')
+Close()
+Open('./FrankRuehlCLM-MediumOblique.ttf')
+SetTTFName(0x409, 2, 'Medium Oblique')
+Generate('./FrankRuehlCLM-MediumOblique.ttf')
+Close()
+Open('./HadasimCLM-Regular.ttf')
+SetTTFName(0x409, 4, 'Hadasim CLM')
+Generate('./HadasimCLM-Regular.ttf')
+Close()
+Open('./HadasimCLM-RegularOblique.ttf')
+SetTTFName(0x409, 2, 'Oblique')
+SetTTFName(0x409, 4, 'Hadasim CLM Oblique')
+Generate('./HadasimCLM-RegularOblique.ttf')
+Close()
+Open('./HadasimCLM-BoldOblique.ttf')
+SetTTFName(0x409, 2, 'Bold Oblique')
+Generate('./HadasimCLM-BoldOblique.ttf')
+Close()
+Open('./KeterYG-MediumOblique.ttf')
+SetTTFName(0x409, 2, 'Medium Oblique')
+Generate('./KeterYG-MediumOblique.ttf')
+Close()
+Open('./KeterYG-BoldOblique.ttf')
+SetTTFName(0x409, 2, 'Bold Oblique')
+Generate('./KeterYG-BoldOblique.ttf')
+Close()
+Open('./MiriamMonoCLM-BookOblique.ttf')
+SetTTFName(0x409, 2, 'Book Oblique')
+Generate('./MiriamMonoCLM-BookOblique.ttf')
+Close()
+Open('./MiriamMonoCLM-BoldOblique.ttf')
+SetTTFName(0x409, 2, 'Bold Oblique')
+Generate('./MiriamMonoCLM-BoldOblique.ttf')
+Close()
+Open('./NachlieliCLM-LightOblique.otf')
+SetTTFName(0x409, 2, 'Light Oblique')
+Generate('./NachlieliCLM-LightOblique.otf')
+Close()
+Open('./NachlieliCLM-BoldOblique.otf')
+SetTTFName(0x409, 2, 'Bold Oblique')
+Generate('./NachlieliCLM-BoldOblique.otf')
+Close()
+Open('./SimpleCLM-MediumOblique.ttf')
+SetTTFName(0x409, 2, 'Medium Oblique')
+SetTTFName(0x409, 4, 'Simple CLM Medium Oblique')
+Generate('./SimpleCLM-MediumOblique.ttf')
+Close()
+Open('./SimpleCLM-BoldOblique.ttf')
+SetTTFName(0x409, 2, 'Bold Oblique')
+SetTTFName(0x409, 4, 'Simple CLM Bold Oblique')
+Generate('./SimpleCLM-BoldOblique.ttf')
+Close()
+Open('./ShofarRegular.ttf')
+SetTTFName(0x409, 4, 'Shofar')
+Generate('./ShofarRegular.ttf')
+Close()
+Open('./ShofarRegularOblique.ttf')
+SetTTFName(0x409, 2, 'Oblique')
+SetTTFName(0x409, 4, 'Shofar Oblique')
+Generate('./ShofarRegularOblique.ttf')
+Close()
+Open('./ShofarDemi-Bold.ttf')
+SetTTFName(0x409, 4, 'Shofar Demi Bold')
+Generate('./ShofarDemi-Bold.ttf')
+Close()
+Open('./ShofarDemi-BoldOblique.ttf')
+SetTTFName(0x409, 2, 'Bold Oblique')
+SetTTFName(0x409, 4, 'Shofar Demi Bold Oblique')
+Generate('./ShofarDemi-BoldOblique.ttf')
+Close()
+Open('./StamAshkenazCLM.ttf')
+SetTTFName(0x409, 4, 'Stam Ashkenaz CLM Medium')
+Generate('./StamAshkenazCLM.ttf')
+Close()
+Open('./StamSefaradCLM.ttf')
+SetTTFName(0x409, 4, 'Stam Sefarad CLM Medium')
+Generate('./StamSefaradCLM.ttf')
+Close()
+
diff --git a/sources b/sources
index 0885911..a73c826 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-fa69a2a60eb34e5766915841d8612e7d culmus-type1-0.121.tar.gz
-58e672defde4caeae42017cd2f9436a6 culmus-0.130.tar.gz
+SHA512 (culmus-0.133.tar.gz) = 97c17dbe4ad5b542a2bfd6c9c7a7afeeabae942cbbd3a718d46ceb18b4020fe7fdf93ade07a65a2da93dadff645abf0da4648713e3452d30bf2a9a79201f2845