rpms/khmeros-fonts/devel 65-0-khmeros-base.conf, NONE, 1.1 65-0-khmeros-battambang.conf, NONE, 1.1 65-0-khmeros-bokor.conf, NONE, 1.1 65-0-khmeros-handwritten.conf, NONE, 1.1 65-0-khmeros-metal-chrieng.conf, NONE, 1.1 65-0-khmeros-muol.conf, NONE, 1.1 65-0-khmeros-siemreap.conf, NONE, 1.1 License.txt, NONE, 1.1 khmeros-fonts.spec, 1.6, 1.7

pnemade pnemade at fedoraproject.org
Mon Jul 12 10:28:38 UTC 2010


Author: pnemade

Update of /cvs/pkgs/rpms/khmeros-fonts/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv25995

Modified Files:
	khmeros-fonts.spec 
Added Files:
	65-0-khmeros-base.conf 65-0-khmeros-battambang.conf 
	65-0-khmeros-bokor.conf 65-0-khmeros-handwritten.conf 
	65-0-khmeros-metal-chrieng.conf 65-0-khmeros-muol.conf 
	65-0-khmeros-siemreap.conf License.txt 
Log Message:
- Added License.txt in -common
- Resolves:rh#586253 - No fontconfig config files provided
- drop -common owning %%{_fontdir}




--- NEW FILE 65-0-khmeros-base.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
	<!-- Generic names -->
	<alias>
		<family>Khmer OS</family>
		<default>
			<family>sans-serif</family>
		</default>
	</alias>
        <alias>
                <family>Khmer OS Content</family>
                <default>
                        <family>sans-serif</family>
                </default>
        </alias>
        <alias>
                <family>Khmer OS System</family>
                <default>
                        <family>sans-serif</family>
                </default>
        </alias>

	<!-- Locale-specific overrides -->
	<match>
		<test name="lang">
			<string>km-kh</string>
			<string>km</string>
		</test>
		<test name="family">
			<string>sans-serif</string>
		</test>
		<edit name="family" mode="prepend">
			<string>Khmer OS</string>
		</edit>
	</match>
        <match>
                <test name="lang">
                        <string>km-kh</string>
                        <string>km</string>
                </test>
                <test name="family">
                        <string>sans-serif</string>
                </test>
                <edit name="family" mode="prepend">
                        <string>Khmer OS Content</string>
                </edit>
        </match>
        <match>
                <test name="lang">
                        <string>km-kh</string>
                        <string>km</string>
                </test>
                <test name="family">
                        <string>sans-serif</string>
                </test>
                <edit name="family" mode="prepend">
                        <string>Khmer OS System</string>
                </edit>
        </match>

</fontconfig>



--- NEW FILE 65-0-khmeros-battambang.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
	<!-- Generic names -->
	<alias>
		<family>Khmer OS Battambang</family>
		<default>
			<family>sans-serif</family>
		</default>
	</alias>
	<!-- Locale-specific overrides -->
	<match>
		<test name="lang">
			<string>km-kh</string>
			<string>km</string>
		</test>
		<test name="family">
			<string>sans-serif</string>
		</test>
		<edit name="family" mode="prepend">
			<string>Khmer OS Battambang</string>
		</edit>
	</match>
</fontconfig>



--- NEW FILE 65-0-khmeros-bokor.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
	<!-- Generic names -->
	<alias>
		<family>Khmer OS Bokor</family>
		<default>
			<family>sans-serif</family>
		</default>
	</alias>
	<!-- Locale-specific overrides -->
	<match>
		<test name="lang">
			<string>km-kh</string>
			<string>km</string>
		</test>
		<test name="family">
			<string>sans-serif</string>
		</test>
		<edit name="family" mode="prepend">
			<string>Khmer OS Bokor</string>
		</edit>
	</match>
</fontconfig>



--- NEW FILE 65-0-khmeros-handwritten.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
	<!-- Generic names -->
	<alias>
		<family>Khmer OS Fasthand</family>
		<default>
			<family>sans-serif</family>
		</default>
	</alias>
        <alias>
		<family>Khmer OS Freehand</family>
		<default>
			<family>sans-serif</family>
		</default>
	</alias>
	<!-- Locale-specific overrides -->
	<match>
		<test name="lang">
			<string>km-kh</string>
			<string>km</string>
		</test>
		<test name="family">
			<string>sans-serif</string>
		</test>
		<edit name="family" mode="prepend">
			<string>Khmer OS Fasthand</string>
		</edit>
	</match>
        <match>
		<test name="lang">
			<string>km-kh</string>
			<string>km</string>
		</test>
		<test name="family">
			<string>sans-serif</string>
		</test>
		<edit name="family" mode="prepend">
			<string>Khmer OS Freehand</string>
		</edit>
	</match>
</fontconfig>



--- NEW FILE 65-0-khmeros-metal-chrieng.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
	<!-- Generic names -->
	<alias>
		<family>Khmer OS Metal Chrieng</family>
		<default>
			<family>sans-serif</family>
		</default>
	</alias>
	<!-- Locale-specific overrides -->
	<match>
		<test name="lang">
			<string>km-kh</string>
			<string>km</string>
		</test>
		<test name="family">
			<string>sans-serif</string>
		</test>
		<edit name="family" mode="prepend">
			<string>Khmer OS Metal Chrieng</string>
		</edit>
	</match>
</fontconfig>



--- NEW FILE 65-0-khmeros-muol.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
	<!-- Generic names -->
	<alias>
		<family>Khmer OS Muol</family>
		<default>
			<family>sans-serif</family>
		</default>
	</alias>
         <alias>
                <family>Khmer OS Muol Pali</family>
                <default>
                        <family>sans-serif</family>
                </default>
         </alias>
         <alias>
                <family>Khmer OS Muol Light</family>
                <default>
                        <family>sans-serif</family>
                </default>
        </alias>

	<!-- Locale-specific overrides -->
	<match>
		<test name="lang">
			<string>km-kh</string>
			<string>km</string>
		</test>
		<test name="family">
			<string>sans-serif</string>
		</test>
		<edit name="family" mode="prepend">
			<string>Khmer OS Muol</string>
		</edit>
	</match>
        <match>
                <test name="lang">
                        <string>km-kh</string>
                        <string>km</string>
                </test>
                <test name="family">
                        <string>sans-serif</string>
                </test>
                <edit name="family" mode="prepend">
                        <string>Khmer OS Muol Pali</string>
                </edit>
        </match>
         <match>
                <test name="lang">
                        <string>km-kh</string>
                        <string>km</string>
                </test>
                <test name="family">
                        <string>sans-serif</string>
                </test>
                <edit name="family" mode="prepend">
                        <string>Khmer OS Muol Light</string>
                </edit>
        </match>

</fontconfig>



--- NEW FILE 65-0-khmeros-siemreap.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
	<!-- Generic names -->
	<alias>
		<family>Khmer OS Siemreap</family>
		<default>
			<family>sans-serif</family>
		</default>
	</alias>
	<!-- Locale-specific overrides -->
	<match>
		<test name="lang">
			<string>km-kh</string>
			<string>km</string>
		</test>
		<test name="family">
			<string>sans-serif</string>
		</test>
		<edit name="family" mode="prepend">
			<string>Khmer OS Siemreap</string>
		</edit>
	</match>
</fontconfig>



--- NEW FILE License.txt ---
KhmerOS - font for the Khmer language of Cambodia
Copyright 2007 Danh Hong

This font is free software; you can redistribute it and/or modify it under the
terms of the GNU Lesser General Public License as published by the Free 
Software Foundation; either version 2.1 of the License, or (at your option) 
any later version.

This library is distributed in the hope that it will be useful, but WITHOUT 
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
FOR A PARTICULAR PURPOSE.? See the GNU Lesser General Public License for 
more details.

You should have received a copy of the GNU Lesser General Public License along
with this font; if not, write to the Free Software Foundation, Inc., 51 
Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA or 
visit http://www.gnu.org/licenses/lgpl.html


Index: khmeros-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/khmeros-fonts/devel/khmeros-fonts.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- khmeros-fonts.spec	25 Jul 2009 04:35:52 -0000	1.6
+++ khmeros-fonts.spec	12 Jul 2010 10:28:38 -0000	1.7
@@ -1,9 +1,9 @@
-%define fontname khmeros
-#%%define fontconf <XX>-%{fontname}
+%global fontname khmeros
+%global archivename All_KhmerOS_%{version}
 
-%define archivename All_KhmerOS_%{version}
+%global fontconf 65-0-%{fontname}
 
-%define common_desc \
+%global 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. \
@@ -13,15 +13,21 @@ They were created by Danh Hong of the Ca
 
 Name:           %{fontname}-fonts
 Version:        5.0
-Release:        7%{?dist}
+Release:        10%{?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)
+Source1:        65-0-khmeros-battambang.conf
+Source2:        65-0-khmeros-bokor.conf
+Source3:        65-0-khmeros-handwritten.conf
+Source4:        65-0-khmeros-base.conf
+Source5:        65-0-khmeros-metal-chrieng.conf
+Source6:        65-0-khmeros-muol.conf
+Source7:        65-0-khmeros-siemreap.conf
+Source8:        License.txt
 
 BuildArch:      noarch
 BuildRequires:  fontpackages-devel
@@ -52,7 +58,7 @@ Obsoletes:      khmeros-fonts-base < 5.0
 
 Base KhmerOS fonts.
 
-%_font_pkg -n base KhmerOS.ttf KhmerOS_content.ttf KhmerOS_sys.ttf
+%_font_pkg -n base -f 65-0-khmeros-base.conf KhmerOS.ttf KhmerOS_content.ttf KhmerOS_sys.ttf
 
 %package -n %{fontname}-battambang-fonts
 Summary:        Battambang font
@@ -65,7 +71,7 @@ Obsoletes:      khmeros-fonts-battambang
 
 Battambang font.
 
-%_font_pkg -n battambang KhmerOS_battambang.ttf
+%_font_pkg -n battambang -f 65-0-khmeros-battambang.conf KhmerOS_battambang.ttf
 
 %package -n %{fontname}-bokor-fonts
 Summary:        Bokor font
@@ -78,7 +84,7 @@ Obsoletes:      khmeros-fonts-bokor < 5.
 
 Bokor font.
 
-%_font_pkg -n bokor KhmerOS_bokor.ttf
+%_font_pkg -n bokor -f 65-0-khmeros-bokor.conf KhmerOS_bokor.ttf
 
 %package -n %{fontname}-handwritten-fonts
 Summary:        Freehand and fasthand fonts
@@ -91,7 +97,7 @@ Obsoletes:      khmeros-fonts-handwritte
 
 Freehand and fasthand - handwritten fonts.
 
-%_font_pkg -n handwritten KhmerOS_freehand.ttf KhmerOS_fasthand.ttf
+%_font_pkg -n handwritten -f 65-0-khmeros-handwritten.conf KhmerOS_freehand.ttf KhmerOS_fasthand.ttf
 
 %package -n %{fontname}-metal-chrieng-fonts
 Summary:        Metal Chrieng font
@@ -104,7 +110,7 @@ Obsoletes:      khmeros-fonts-metalchrie
 
 Metal Chrieng font.
 
-%_font_pkg -n metal-chrieng KhmerOS_metalchrieng.ttf
+%_font_pkg -n metal-chrieng -f 65-0-khmeros-metal-chrieng.conf  KhmerOS_metalchrieng.ttf
 
 %package -n %{fontname}-muol-fonts
 Summary:        Muol fonts - normal, light and Pali
@@ -117,7 +123,7 @@ Obsoletes:      khmeros-fonts-muol < 5.0
 
 Muol fonts - normal, light and Pali.
 
-%_font_pkg -n muol KhmerOS_muol.ttf KhmerOS_muollight.ttf KhmerOS_muolpali.ttf
+%_font_pkg -n muol -f 65-0-khmeros-muol.conf KhmerOS_muol.ttf KhmerOS_muollight.ttf KhmerOS_muolpali.ttf
 
 %package -n %{fontname}-siemreap-fonts
 Summary:        Siemreap font
@@ -130,50 +136,49 @@ Obsoletes:      khmeros-fonts-siemreap <
 
 Siemreap font.
 
-%_font_pkg -n siemreap KhmerOS_siemreap.ttf
+%_font_pkg -n siemreap -f 65-0-khmeros-siemreap.conf KhmerOS_siemreap.ttf
 
 
 %prep
 %setup -q -n %{archivename}
+install -p %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} .
+install -p %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} .
 
 
 %build
-
+#nothing
 
 %install
-rm -rf %{buildroot}
-
 # get rid of the white space (' ')
 mv 'KhmerOS .ttf' KhmerOS.ttf
 
 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}
+install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
+                   %{buildroot}%{_fontconfig_confdir}
 
+for conffile in *.conf ; do
+install -m 0644 -p $conffile %{buildroot}%{_fontconfig_templatedir}/${conffile}
+ln -s %{_fontconfig_templatedir}/$conffile \
+      %{buildroot}%{_fontconfig_confdir}/$conffile
+done
 
 %files common
 %defattr(0644,root,root,0755)
-%dir %{_fontdir}
+%doc License.txt
 
 
 %changelog
+* Mon Jul 12 2010 Parag <pnemade AT redhat.com> - 5.0-10
+- Added License.txt in -common 
+
+* Thu May 20 2010 Parag <pnemade AT redhat.com> - 5.0-9
+- Resolves:rh#586253 - No fontconfig config files provided
+
+* Tue Feb 16 2010 Parag <pnemade AT redhat.com> - 5.0-8
+- drop -common owning %%{_fontdir}
+      
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.0-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



More information about the scm-commits mailing list