rpms/khmeros-fonts/devel import.log, 1.1, 1.2 khmeros-fonts.spec, 1.1, 1.2
Michal Nowak
mnowak at fedoraproject.org
Sat Jan 24 12:37:42 UTC 2009
Author: mnowak
Update of /cvs/pkgs/rpms/khmeros-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25925/devel
Modified Files:
import.log khmeros-fonts.spec
Log Message:
changes to comply with F11 font rules
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/khmeros-fonts/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log 11 Jul 2008 08:23:07 -0000 1.1
+++ import.log 24 Jan 2009 12:37:12 -0000 1.2
@@ -1 +1,2 @@
khmeros-fonts-5_0-3_fc9:HEAD:khmeros-fonts-5.0-3.fc9.src.rpm:1215764336
+khmeros-fonts-5_0-4_fc10:HEAD:khmeros-fonts-5.0-4.fc10.src.rpm:1232800449
Index: khmeros-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/khmeros-fonts/devel/khmeros-fonts.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- khmeros-fonts.spec 11 Jul 2008 08:23:07 -0000 1.1
+++ khmeros-fonts.spec 24 Jan 2009 12:37:12 -0000 1.2
@@ -1,107 +1,131 @@
-%define fontname khmeros
-%define fontdir %{_datadir}/fonts/%{fontname}
-%define archivename All_KhmerOS_%{version}
+%define fontname khmeros
+#%%define fontconf <XX>-%{fontname}
+
+%define archivename All_KhmerOS_%{version}
+
+%define common_desc \
+The Khmer OS fonts include Khmer and Latin alphabets, and they have equivalent \
+sizes for Khmer and English alphabets, so that when texts mix both it is not \
+necessary to have different point sizes for the text in each language. \
+\
+They were created by Danh Hong of the Cambodian Open Institute.
+
Name: %{fontname}-fonts
Version: 5.0
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Khmer font set created by Danh Hong of the Cambodian Open Institute
Group: User Interface/X
License: LGPLv2+
URL: http://www.khmeros.info/drupal/?q=en/download/fonts
Source0: http://downloads.sourceforge.net/khmer/%{archivename}.zip
+#Source1: %{name}-fontconfig.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
+BuildRequires: fontpackages-devel
%description
-The Khmer OS fonts include Khmer and Latin alphabets, and they have equivalent
-sizes for Khmer and English alphabets, so that when texts mix both it is not
-necessary to have different point sizes for the text in each language.
+%common_desc
-They were created by Danh Hong of the Cambodian Open Institute.
-%package base
-Summary: Base Khmer font set created by Danh Hong of the Cambodian Open Institute
-Group: User Interface/X
-%description base
-The Khmer OS fonts include base Khmer and Latin alphabets, and they have
-equivalent sizes for Khmer and English alphabets, so that when texts mix
-both it is not necessary to have different point sizes for the text in each
-language.
+#%package common
+#Summary: Common files of %{name}
+#Group: User Interface/X
+#Requires: fontpackages-filesystem
+#
+#%description common
+#%common_desc
+#
+#This package consists of files used by other %{name} packages.
-They were created by Danh Hong of the Cambodian Open Institute.
-%package battambang
-Summary: Khmer font set created by Danh Hong of the Cambodian Open Institute
-Group: User Interface/X
-%description battambang
-The Khmer OS fonts include Khmer and Latin alphabets, and they have
-equivalent sizes for Khmer and English alphabets, so that when texts mix
-both it is not necessary to have different point sizes for the text in each
-language.
+%package -n %{fontname}-base-fonts
+Summary: Base KhmerOS font
+Group: User Interface/X
+#Requires: %{name}-common = %{version}-%{release}
+#Obsoletes: khmeros-fonts-base <= %{version}-3
+#Provides: khmeros-fonts-base-%{version}-%{release}
-They were created by Danh Hong of the Cambodian Open Institute.
+%description -n %{fontname}-base-fonts
+%common_desc
-%package bokor
-Summary: Khmer font set created by Danh Hong of the Cambodian Open Institute
-Group: User Interface/X
-%description bokor
-The Khmer OS fonts include Khmer and Latin alphabets, and they have
-equivalent sizes for Khmer and English alphabets, so that when texts mix
-both it is not necessary to have different point sizes for the text in each
-language.
+Base KhmerOS fonts.
-They were created by Danh Hong of the Cambodian Open Institute.
+%_font_pkg -n base KhmerOS.ttf KhmerOS_content.ttf KhmerOS_sys.ttf
+%package -n %{fontname}-battambang-fonts
+Summary: Battambang font
+Group: User Interface/X
+#Requires: %{name}-common = %{version}-%{release}
-%package handwritten
-Summary: Handwritten Khmer font set created by Danh Hong of the Cambodian Open Institute
-Group: User Interface/X
-%description handwritten
-The Khmer OS fonts include Khmer and Latin alphabets, and they have
-equivalent sizes for Khmer and English alphabets, so that when texts mix
-both it is not necessary to have different point sizes for the text in each
-language.
+%description -n %{fontname}-battambang-fonts
+%common_desc
-They were created by Danh Hong of the Cambodian Open Institute.
+Battambang font.
+%_font_pkg -n battambang KhmerOS_battambang.ttf
-%package metalchrieng
-Summary: Old-fashioned Khmer font set by Danh Hong of the Cambodian Open Institute
-Group: User Interface/X
-%description metalchrieng
-The Khmer OS fonts include Khmer and Latin alphabets, and they have
-equivalent sizes for Khmer and English alphabets, so that when texts mix
-both it is not necessary to have different point sizes for the text in each
-language.
+%package -n %{fontname}-bokor-fonts
+Summary: Bokor font
+Group: User Interface/X
+#Requires: %{name}-common = %{version}-%{release}
-They were created by Danh Hong of the Cambodian Open Institute.
+%description -n %{fontname}-bokor-fonts
+%common_desc
+Bokor font.
-%package muol
-Summary: Khmer font set created by Danh Hong of the Cambodian Open Institute
-Group: User Interface/X
-%description muol
-The Khmer OS fonts include Khmer and Latin alphabets, and they have
-equivalent sizes for Khmer and English alphabets, so that when texts mix
-both it is not necessary to have different point sizes for the text in each
-language.
+%_font_pkg -n bokor KhmerOS_bokor.ttf
-They were created by Danh Hong of the Cambodian Open Institute.
+%package -n %{fontname}-handwritten-fonts
+Summary: Freehand and fasthand fonts
+Group: User Interface/X
+#Requires: %{name}-common = %{version}-%{release}
+%description -n %{fontname}-handwritten-fonts
+%common_desc
-%package siemreap
-Summary: Khmer font set created by Danh Hong of the Cambodian Open Institute
-Group: User Interface/X
-%description siemreap
-The Khmer OS fonts include Khmer and Latin alphabets, and they have
-equivalent sizes for Khmer and English alphabets, so that when texts mix
-both it is not necessary to have different point sizes for the text in each
-language.
+Freehand and fasthand - handwritten fonts.
-They were created by Danh Hong of the Cambodian Open Institute.
+%_font_pkg -n handwritten KhmerOS_freehand.ttf KhmerOS_fasthand.ttf
+
+%package -n %{fontname}-metal-chrieng-fonts
+Summary: Metal Chrieng font
+Group: User Interface/X
+#Requires: %{name}-common = %{version}-%{release}
+
+%description -n %{fontname}-metal-chrieng-fonts
+%common_desc
+
+Metal Chrieng font.
+
+%_font_pkg -n metal-chrieng KhmerOS_metalchrieng.ttf
+
+%package -n %{fontname}-muol-fonts
+Summary: Muol fonts - normal, light and Pali
+Group: User Interface/X
+#Requires: %{name}-common = %{version}-%{release}
+
+%description -n %{fontname}-muol-fonts
+%common_desc
+
+Muol fonts - normal, light and Pali.
+
+%_font_pkg -n muol KhmerOS_muol.ttf KhmerOS_muollight.ttf KhmerOS_muolpali.ttf
+
+%package -n %{fontname}-siemreap-fonts
+Summary: Siemreap font
+Group: User Interface/X
+#Requires: %{name}-common = %{version}-%{release}
+
+%description -n %{fontname}-siemreap-fonts
+%common_desc
+
+Siemreap font.
+
+%_font_pkg -n siemreap KhmerOS_siemreap.ttf
%prep
@@ -114,125 +138,40 @@
%install
rm -rf %{buildroot}
-# One of the fonts is named 'KhmerOS .ttf' (note the space).
-# 1) It is apparently a mistake.
-# 2) Have problems with installing it inside %%files base
-rename ' ' '' *
+# get rid of the white space (' ')
+mv 'KhmerOS .ttf' KhmerOS.ttf
-install -dm 755 %{buildroot}%{fontdir}
-install -pm 644 *.ttf %{buildroot}%{fontdir}
+install -m 0755 -d %{buildroot}%{_fontdir}
+install -m 0644 -p *.ttf %{buildroot}%{_fontdir}
+
+#install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
+# %{buildroot}%{_fontconfig_confdir}
+
+# Repeat for every font family
+#install -m 0644 -p %{SOURCEX} \
+# %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-<FAMILYX>.conf
+
+#for fconf in %{fontconf}-<FAMILYX>.conf \
+# %{fontconf}-<FAMILYY>.conf \
+# %{fontconf}-<FAMILYZ>.conf ; do
+# ln -s %{_fontconfig_templatedir}/$fconf \
+# %{buildroot}%{_fontconfig_confdir}/$fconf
+#done
%clean
rm -rf %{buildroot}
-%post base
-if [ -x %{_bindir}/fc-cache ] ; then
- %{_bindir}/fc-cache -f %{fontdir} || :
-fi
-
-%post battambang
-if [ -x %{_bindir}/fc-cache ] ; then
- %{_bindir}/fc-cache -f %{fontdir} || :
-fi
-
-%post bokor
-if [ -x %{_bindir}/fc-cache ] ; then
- %{_bindir}/fc-cache -f %{fontdir} || :
-fi
-
-%post handwritten
-if [ -x %{_bindir}/fc-cache ] ; then
- %{_bindir}/fc-cache -f %{fontdir} || :
-fi
-
-%post metalchrieng
-if [ -x %{_bindir}/fc-cache ] ; then
- %{_bindir}/fc-cache -f %{fontdir} || :
-fi
-
-%post muol
-if [ -x %{_bindir}/fc-cache ] ; then
- %{_bindir}/fc-cache -f %{fontdir} || :
-fi
-
-%post siemreap
-if [ -x %{_bindir}/fc-cache ] ; then
- %{_bindir}/fc-cache -f %{fontdir} || :
-fi
-
-%postun base
-if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then
- %{_bindir}/fc-cache -f %{fontdir} || :
-fi
-%postun battambang
-if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then
- %{_bindir}/fc-cache -f %{fontdir} || :
-fi
-%postun bokor
-if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then
- %{_bindir}/fc-cache -f %{fontdir} || :
-fi
-%postun handwritten
-if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then
- %{_bindir}/fc-cache -f %{fontdir} || :
-fi
-%postun metalchrieng
-if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then
- %{_bindir}/fc-cache -f %{fontdir} || :
-fi
-%postun muol
-if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then
- %{_bindir}/fc-cache -f %{fontdir} || :
-fi
-%postun siemreap
-if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then
- %{_bindir}/fc-cache -f %{fontdir} || :
-fi
-
-
-%files base
-%defattr(644,root,root,755)
-%dir %{fontdir}
-%{fontdir}/KhmerOS.ttf
-%{fontdir}/KhmerOS_sys.ttf
-%{fontdir}/KhmerOS_content.ttf
-
-%files battambang
-%defattr(644,root,root,755)
-%dir %{fontdir}
-%{fontdir}/KhmerOS_battambang.ttf
-
-%files bokor
-%defattr(644,root,root,755)
-%dir %{fontdir}
-%{fontdir}/KhmerOS_bokor.ttf
-
-%files handwritten
-%defattr(644,root,root,755)
-%dir %{fontdir}
-%{fontdir}/KhmerOS_fasthand.ttf
-%{fontdir}/KhmerOS_freehand.ttf
-
-%files metalchrieng
-%defattr(644,root,root,755)
-%dir %{fontdir}
-%{fontdir}/KhmerOS_metalchrieng.ttf
-
-%files muol
-%defattr(644,root,root,755)
-%dir %{fontdir}
-%{fontdir}/KhmerOS_muol.ttf
-%{fontdir}/KhmerOS_muolpali.ttf
-%{fontdir}/KhmerOS_muollight.ttf
-
-%files siemreap
-%defattr(644,root,root,755)
-%dir %{fontdir}
-%{fontdir}/KhmerOS_siemreap.ttf
+#%files common
+#%defattr(0644,root,root,0755)
+#%dir %{_fontdir}
+
%changelog
+* Fri Jan 23 2009 Michal Nowak <mnowak at redhat.com> - 5.0-4
+- changes to comply with F11 font rules
+
* Tue Jul 8 2008 Michal Nowak <mnowak at redhat.com> - 5.0-3
- reshaping to multiple subpackages based on font type/purpose
- license uncertainity is solved; licence field is set according
@@ -243,5 +182,5 @@
- refactoring summary and description texts (Nicolas Mailhot)
* Fri Jul 4 2008 Michal Nowak <mnowak at redhat.com> - 5.0-1
-- Initial release
+- initial release
More information about the Fedora-fonts-bugs-list
mailing list