diff --git a/.cvsignore b/.cvsignore
index e45a75d..71af20f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-culmus-0.101.tar.gz
+culmus-0.102.tar.gz
diff --git a/62-culmus-aharoni-clm.conf b/62-culmus-aharoni-clm.conf
new file mode 100644
index 0000000..02bdbee
--- /dev/null
+++ b/62-culmus-aharoni-clm.conf
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+ Guttman Aharoni
+ Guttman-Aharoni
+ Aharoni CLM
+
+
+
+
+ Aharoni
+ Aharoni CLM
+
+
+
diff --git a/62-culmus-caladings-clm.conf b/62-culmus-caladings-clm.conf
new file mode 100644
index 0000000..aa8c90f
--- /dev/null
+++ b/62-culmus-caladings-clm.conf
@@ -0,0 +1,8 @@
+
+
+
+
+
+ Caladings Caladings CLM
+
+
diff --git a/62-culmus-david-clm.conf b/62-culmus-david-clm.conf
new file mode 100644
index 0000000..da1eac5
--- /dev/null
+++ b/62-culmus-david-clm.conf
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+
+
+
+ Guttman Adii
+
+
+ David CLM
+
+
+ Medium Italic
+
+
+
+
+ David Transparent
+ Guttman David
+ David CLM
+
+
+
+ David David CLM
+ David OT David CLM
+
+
+ Raanana David CLM
+
diff --git a/62-culmus-drugulin-clm.conf b/62-culmus-drugulin-clm.conf
new file mode 100644
index 0000000..15ef122
--- /dev/null
+++ b/62-culmus-drugulin-clm.conf
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+ Guttman Drogolin
+ Guttman Vilna
+ Drugulin CLM
+
+
+
+ Drugulin Drugulin CLM
+
+
diff --git a/62-culmus-ellinia-clm.conf b/62-culmus-ellinia-clm.conf
new file mode 100644
index 0000000..60a5fa6
--- /dev/null
+++ b/62-culmus-ellinia-clm.conf
@@ -0,0 +1,8 @@
+
+
+
+
+
+ Ellinia Ellinia CLM
+
+
diff --git a/62-culmus-frank-ruehl-clm.conf b/62-culmus-frank-ruehl-clm.conf
new file mode 100644
index 0000000..fd95e6f
--- /dev/null
+++ b/62-culmus-frank-ruehl-clm.conf
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+ FrankRuehl
+ Guttman Frank
+ Guttman Frnew
+ Frank Ruehl CLM
+
+
+
+ Frank Ruehl Frank Ruehl CLM
+
+
+ New Peninim MT Frank Ruehl CLM
+
+
diff --git a/62-culmus-miriam-clm.conf b/62-culmus-miriam-clm.conf
new file mode 100644
index 0000000..4950519
--- /dev/null
+++ b/62-culmus-miriam-clm.conf
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+ Guttman Miryam
+ Levenim MT
+ Miriam
+ Miriam Transparent
+ Miriam CLM
+
+
+
diff --git a/62-culmus-miriam-mono-clm.conf b/62-culmus-miriam-mono-clm.conf
new file mode 100644
index 0000000..4bba546
--- /dev/null
+++ b/62-culmus-miriam-mono-clm.conf
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+ Fixed Miriam Transparent
+ Guttman Myamfix
+ Guttman-CourMir
+ Miriam Fixed
+ Miriam Mono CLM
+
+
+
+ Miriam Mono Miriam Mono CLM
+
+
diff --git a/62-culmus-nachlieli-clm.conf b/62-culmus-nachlieli-clm.conf
new file mode 100644
index 0000000..968a728
--- /dev/null
+++ b/62-culmus-nachlieli-clm.conf
@@ -0,0 +1,11 @@
+
+
+
+
+
+ Nachlieli Nachlieli CLM
+
+
+ ArialHB Nachlieli CLM
+
+
diff --git a/culmus-fonts.spec b/culmus-fonts.spec
index ab1030b..5be890f 100644
--- a/culmus-fonts.spec
+++ b/culmus-fonts.spec
@@ -1,59 +1,216 @@
%define fontname culmus
-%define fontdir %{_datadir}/fonts/%{fontname}
+%define fontconf 62-%{fontname}
-Name: %{fontname}-fonts
-Version: 0.101
-Release: 5%{?dist}
-License: GPLv2
-Source: http://downloads.sourceforge.net/sourceforge/%{fontname}/%{fontname}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch: noarch
-Group: User Interface/X
-#Provides can be dropped in F11.
-Provides: fonts-hebrew = 0.101-2
-Obsoletes: fonts-hebrew <= 0.101-2
-Summary: Fonts for Hebrew from Culmus project
-URL: http://culmus.sourceforge.net/
-
-%description
-The culmus-fonts package contains fonts for the display of
+#%define archivename %{name}-%{version}
+
+%define common_desc \
+The culmus-fonts package contains fonts for the display of\
Hebrew from the Culmus project.
+
+Name: %{fontname}-fonts
+Version: 0.102
+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
+Source1: %{fontconf}-aharoni-clm.conf
+Source2: %{fontconf}-caladings-clm.conf
+Source3: %{fontconf}-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
+
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
+BuildArch: noarch
+BuildRequires: fontpackages-devel
+
+%description
+%common_desc
+
+
+%package common
+Summary: Common files of culmus-fonts
+Group: User Interface/X
+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
+Group: User Interface/X
+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
+
+%package -n %{fontname}-caladings-clm-fonts
+Summary: Fonts for Hebrew from Culmus project
+Group: User Interface/X
+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
+
+%package -n %{fontname}-david-clm-fonts
+Summary: Fonts for Hebrew from Culmus project
+Group: User Interface/X
+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
+
+%package -n %{fontname}-drugulin-clm-fonts
+Summary: Fonts for Hebrew from Culmus project
+Group: User Interface/X
+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
+
+%package -n %{fontname}-ellinia-clm-fonts
+Summary: Fonts for Hebrew from Culmus project
+Group: User Interface/X
+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
+
+%package -n %{fontname}-frank-ruehl-clm-fonts
+Summary: Fonts for Hebrew from Culmus project
+Group: User Interface/X
+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-*.afm FrankRuehlCLM-*.pfa
+
+%package -n %{fontname}-miriam-clm-fonts
+Summary: Fonts for Hebrew from Culmus project
+Group: User Interface/X
+Requires: %{name}-common = %{version}-%{release}
+
+%description -n %{fontname}-miriam-clm-fonts
+%common_desc
+
+%_font_pkg -n miriam-clm -f %{fontconf}-miriam-clm.conf MiriamCLM-*.afm MiriamCLM-*.pfa
+
+%package -n %{fontname}-miriam-mono-clm-fonts
+Summary: Fonts for Hebrew from Culmus project
+Group: User Interface/X
+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-*.afm MiriamMonoCLM-*.pfa
+
+%package -n %{fontname}-nachlieli-clm-fonts
+Summary: Fonts for Hebrew from Culmus project
+Group: User Interface/X
+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
+
+%package -n %{fontname}-yehuda-clm-fonts
+Summary: Fonts for Hebrew from Culmus project
+Group: User Interface/X
+Requires: %{name}-common = %{version}-%{release}
+
+%description -n %{fontname}-yehuda-clm-fonts
+%common_desc
+
+%_font_pkg -n yehuda-clm YehudaCLM-*.afm YehudaCLM-*.pfa
+
%prep
%setup -q -n %{fontname}-%{version}
%build
-echo "Nothing to do in Build."
%install
-rm -rf %{buildroot}
+rm -fr %{buildroot}
+
+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}/%{fontconf}-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
+
+for fconf in %{fontconf}-aharoni-clm.conf \
+ %{fontconf}-caladings-clm.conf \
+ %{fontconf}-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 ; do
+ ln -s %{_fontconfig_templatedir}/$fconf \
+ %{buildroot}%{_fontconfig_confdir}/$fconf
+done
-install -m 0755 -d %{buildroot}%{fontdir}
-install -m 0644 -p *.pfa *.afm %{buildroot}%{fontdir}
%clean
-rm -rf %{buildroot}
+rm -fr %{buildroot}
-%post
-if [ -x %{_bindir}/fc-cache ]; then
- %{_bindir}/fc-cache %{fontdir}
-fi
-%postun
-if [ "$1" = "0" ]; then
- if [ -x %{_bindir}/fc-cache ]; then
- %{_bindir}/fc-cache %{fontdir}
- fi
-fi
+%files common
+%defattr(0644,root,root,0755)
+%doc CHANGES GNU-GPL LICENSE LICENSE-BITSTREAM
+
+%dir %{_fontdir}
-%files
-%defattr(-,root,root,-)
-%doc CHANGES GNU-GPL LICENSE LICENSE-BITSTREAM
-%dir %{fontdir}
-%{fontdir}/*.pfa
-%{fontdir}/*.afm
%changelog
+* Wed Feb 04 2009 Rahul Bhalerao - 0.102-1.fc11
+- Updated version.
+- Following new font packaging guidelines.
+
* Wed Jul 23 2008 Rahul Bhalerao - 0.101-5.fc10
- Obsoleted dead package fonts-hebrew
diff --git a/sources b/sources
index 0271306..b9eba02 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4dff942d859b9cac569d791c664e66a5 culmus-0.101.tar.gz
+720d0dcce6e6a60db64de04e5afdb424 culmus-0.102.tar.gz