diff --git a/.gitignore b/.gitignore
index 6619b18..a2027cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ culmus-0.104.tar.gz
culmus-type1-0.104.tar.gz
/culmus-0.105.tar.gz
/culmus-type1-0.105.tar.gz
+/culmus-0.120.tar.gz
diff --git a/65-culmus-hadasim-clm.conf b/65-culmus-hadasim-clm.conf
new file mode 100644
index 0000000..08882fd
--- /dev/null
+++ b/65-culmus-hadasim-clm.conf
@@ -0,0 +1,17 @@
+
+
+
+
+ serif
+
+ Hadasim CLM
+
+
+
+ Hadasim CLM
+
+ serif
+
+
+
+
diff --git a/65-culmus-keteryg.conf b/65-culmus-keteryg.conf
new file mode 100644
index 0000000..0286f8d
--- /dev/null
+++ b/65-culmus-keteryg.conf
@@ -0,0 +1,17 @@
+
+
+
+
+ serif
+
+ Keter YG
+
+
+
+ Keter YG
+
+ serif
+
+
+
+
diff --git a/65-culmus-simple-clm.conf b/65-culmus-simple-clm.conf
new file mode 100644
index 0000000..b8f0263
--- /dev/null
+++ b/65-culmus-simple-clm.conf
@@ -0,0 +1,17 @@
+
+
+
+
+ sans-serif
+
+ Simple CLM
+
+
+
+ Simple CLM
+
+ sans-serif
+
+
+
+
diff --git a/65-culmus-stamashkenaz-clm.conf b/65-culmus-stamashkenaz-clm.conf
new file mode 100644
index 0000000..fb6695f
--- /dev/null
+++ b/65-culmus-stamashkenaz-clm.conf
@@ -0,0 +1,17 @@
+
+
+
+
+ serif
+
+ Stam Ashkenaz CLM
+
+
+
+ Stam Ashkenaz CLM
+
+ serif
+
+
+
+
diff --git a/65-culmus-stamsefarad-clm.conf b/65-culmus-stamsefarad-clm.conf
new file mode 100644
index 0000000..0fea2a6
--- /dev/null
+++ b/65-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 aa4474d..4d58fc9 100644
--- a/culmus-fonts.spec
+++ b/culmus-fonts.spec
@@ -7,14 +7,14 @@ Hebrew from the Culmus project.
Name: %{fontname}-fonts
-Version: 0.105
+Version: 0.120
Release: 1%{?dist}
Summary: Fonts for Hebrew from Culmus project
Group: User Interface/X
License: GPLv2
URL: http://culmus.sourceforge.net
-Source0: http://downloads.sourceforge.net/sourceforge/%{fontname}/%{fontname}-%{version}.tar.gz
+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
@@ -24,7 +24,12 @@ Source6: %{fontconf}-frank-ruehl-clm.conf
Source7: %{fontconf}-miriam-clm.conf
Source8: %{fontconf}-miriam-mono-clm.conf
Source9: %{fontconf}-nachlieli-clm.conf
-Source10: http://downloads.sourceforge.net/project/culmus/culmus/0.104/%{fontname}-type1-%{version}.tar.gz
+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: http://downloads.sourceforge.net/culmus/culmus-type1-0.105.tar.gz
Obsoletes: culmus-fonts < 0.102-1
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -70,11 +75,17 @@ Requires: %{fontname}-david-clm-fonts = %{version}-%{release}
Requires: %{fontname}-drugulin-clm-fonts = %{version}-%{release}
Requires: %{fontname}-ellinia-clm-fonts = %{version}-%{release}
Requires: %{fontname}-frank-ruehl-clm-fonts = %{version}-%{release}
+Requires: %{fontname}-hadasim-clm-fonts = %{version}-%{release}
+Requires: %{fontname}-keteryg-fonts = %{version}-%{release}
Requires: %{fontname}-miriam-clm-fonts = %{version}-%{release}
Requires: %{fontname}-miriam-mono-clm-fonts = %{version}-%{release}
Requires: %{fontname}-nachlieli-clm-fonts = %{version}-%{release}
+Requires: %{fontname}-simple-clm-fonts = %{version}-%{release}
+Requires: %{fontname}-stamashkenaz-clm-fonts = %{version}-%{release}
+Requires: %{fontname}-stamsefarad-clm-fonts = %{version}-%{release}
Requires: %{fontname}-yehuda-clm-fonts = %{version}-%{release}
+
%description -n %{fontname}-fonts-compat
%common_desc
Meta-package for installing all font families of Culmus.
@@ -146,6 +157,28 @@ Requires: %{name}-common = %{version}-%{release}
%_font_pkg -n frank-ruehl-clm -f %{fontconf}-frank-ruehl-clm.conf FrankRuehlCLM-*.afm FrankRuehlCLM-*.pfa
+
+%package -n %{fontname}-hadasim-clm-fonts
+Summary: Fonts for Hebrew from Culmus project
+Group: User Interface/X
+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
+
+%package -n %{fontname}-keteryg-fonts
+Summary: Fonts for Hebrew from Culmus project
+Group: User Interface/X
+Requires: %{name}-common = %{version}-%{release}
+
+%description -n %{fontname}-keteryg-fonts
+%common_desc
+
+%_font_pkg -n keteryg -f %{fontconf}-keteryg.conf KeterYG-*.ttf
+
+
%package -n %{fontname}-miriam-clm-fonts
Summary: Fonts for Hebrew from Culmus project
Group: User Interface/X
@@ -176,6 +209,38 @@ Requires: %{name}-common = %{version}-%{release}
%_font_pkg -n nachlieli-clm -f %{fontconf}-nachlieli-clm.conf NachlieliCLM-*.afm NachlieliCLM-*.pfa
+
+%package -n %{fontname}-simple-clm-fonts
+Summary: Fonts for Hebrew from Culmus project
+Group: User Interface/X
+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
+
+%package -n %{fontname}-stamashkenaz-clm-fonts
+Summary: Fonts for Hebrew from Culmus project
+Group: User Interface/X
+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
+
+%package -n %{fontname}-stamsefarad-clm-fonts
+Summary: Fonts for Hebrew from Culmus project
+Group: User Interface/X
+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
+
+
%package -n %{fontname}-yehuda-clm-fonts
Summary: Fonts for Hebrew from Culmus project
Group: User Interface/X
@@ -188,9 +253,9 @@ Requires: %{name}-common = %{version}-%{release}
%prep
%setup -q -n %{fontname}-%{version}
-%setup -c -q -a 10
+%setup -c -q -a 15
mv %{fontname}-%{version}/* .
-mv %{fontname}-type1-%{version}/* .
+mv %{fontname}-type1-0.105/* .
%build
@@ -223,6 +288,16 @@ 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
for fconf in %{fontconf}-aharoni-clm.conf \
%{fontconf}-caladings-clm.conf \
@@ -232,7 +307,12 @@ for fconf in %{fontconf}-aharoni-clm.conf \
%{fontconf}-frank-ruehl-clm.conf \
%{fontconf}-miriam-clm.conf \
%{fontconf}-miriam-mono-clm.conf \
- %{fontconf}-nachlieli-clm.conf ; do
+ %{fontconf}-nachlieli-clm.conf \
+ %{fontconf}-hadasim-clm.conf \
+ %{fontconf}-keteryg.conf \
+ %{fontconf}-simple-clm.conf \
+ %{fontconf}-stamashkenaz-clm.conf \
+ %{fontconf}-stamsefarad-clm.conf ; do
ln -s %{_fontconfig_templatedir}/$fconf \
%{buildroot}%{_fontconfig_confdir}/$fconf
done
@@ -250,6 +330,10 @@ rm -fr %{buildroot}
%changelog
+* Mon Nov 22 2010 Pravin Satpute - 0.120-1
+- Upstream new release.
+- Added new families Hadasim CLM, Keter YG, Simple CLM, Stam Ashkenaz CLM, Stam Sefarad CLM
+
* Fri Sep 03 2010 Pravin Satpute - 0.105-1
- Upstream new release.
- Miriam Mono family is now OpenType and has diacritics support developed by Yoram Gnat.
diff --git a/sources b/sources
index 38cc8e2..141017b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-fe2266d538566b323e6ad5671b69a8fb culmus-0.105.tar.gz
061e349a233daae61b40be0121a1da7f culmus-type1-0.105.tar.gz
+1712e860cf82546c16dbbd19b285e391 culmus-0.120.tar.gz