rpms/samyak-fonts/devel 68-samyak-malayalam.conf, NONE, 1.1 67-samyak-devanagari.conf, 1.1, 1.2 67-samyak-gujarati.conf, 1.1, 1.2 67-samyak-oriya.conf, 1.1, 1.2 67-samyak-tamil.conf, 1.1, 1.2 samyak-fonts.spec, 1.11, 1.12 69-samyak-malayalam.conf, 1.1, NONE
Author: nkumar
Update of /cvs/pkgs/rpms/samyak-fonts/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2200
Modified Files: 67-samyak-devanagari.conf 67-samyak-gujarati.conf 67-samyak-oriya.conf 67-samyak-tamil.conf samyak-fonts.spec Added Files: 68-samyak-malayalam.conf Removed Files: 69-samyak-malayalam.conf Log Message: * Wed Mar 3 2010 Naveen Kumar nkumar@redhat.com 1.2.1-8 - Updated .conf file - Resolves Bug#568254
--- NEW FILE 68-samyak-malayalam.conf --- <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE fontconfig SYSTEM "fonts.dtd"> <fontconfig> <match> <test name="lang"> <string>ml-in</string> </test> <test name="family"> <string>serif</string> </test> <edit name="family" mode="prepend" binding="same"> <string>Samyak Malayalam</string> </edit> </match> <alias> <family>Samyak Malayalam</family> <default> <family>serif</family> </default> </alias> </fontconfig>
Index: 67-samyak-devanagari.conf =================================================================== RCS file: /cvs/pkgs/rpms/samyak-fonts/devel/67-samyak-devanagari.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- 67-samyak-devanagari.conf 28 Oct 2009 07:38:24 -0000 1.1 +++ 67-samyak-devanagari.conf 3 Mar 2010 09:56:17 -0000 1.2 @@ -2,16 +2,125 @@ <!DOCTYPE fontconfig SYSTEM "fonts.dtd"> <fontconfig> <match> - <test name="lang" compare="contains"> - <string>hi</string> + <test name="lang"> + <string>hi-in</string> </test> <test name="family"> <string>serif</string> </test> - <edit name="family" mode="prepend_first" binding="same"> + <edit name="family" mode="prepend" binding="same"> <string>Samyak Devanagari</string> </edit> </match> + +<match> + <test name="lang"> + <string>mr-in</string> + </test> + <test name="family"> + <string>serif</string> + </test> + <edit name="family" mode="prepend" binding="same"> + <string>Samyak Devanagari</string> + </edit> +</match> + +<match> + <test name="lang"> + <string>kok-in</string> + </test> + <test name="family"> + <string>serif</string> + </test> + <edit name="family" mode="prepend" binding="same"> + <string>Samyak Devanagari</string> + </edit> +</match> + +<match> + <test name="lang"> + <string>ks-in@devanagari</string> + </test> + <test name="family"> + <string>serif</string> + </test> + <edit name="family" mode="prepend" binding="same"> + <string>Lohit Devanagari</string> + </edit> +</match> + +<match> + <test name="lang"> + <string>sd-in@devanagari</string> + </test> + <test name="family"> + <string>serif</string> + </test> + <edit name="family" mode="prepend" binding="same"> + <string>Samyak Devanagari</string> + </edit> +</match> + +<match> + <test name="lang"> + <string>mai-in</string> + </test> + <test name="family"> + <string>serif</string> + </test> + <edit name="family" mode="prepend" binding="same"> + <string>Samyak Devanagari</string> + </edit> +</match> + +<match> + <test name="lang"> + <string>ne-in</string> + </test> + <test name="family"> + <string>serif</string> + </test> + <edit name="family" mode="prepend" binding="same"> + <string>Samyak Devanagari</string> + </edit> +</match> + +<match> + <test name="lang"> + <string>brx-in</string> + </test> + <test name="family"> + <string>serif</string> + </test> + <edit name="family" mode="prepend" binding="same"> + <string>Samyak Devanagari</string> + </edit> +</match> + +<match> + <test name="lang"> + <string>doi-in</string> + </test> + <test name="family"> + <string>serif</string> + </test> + <edit name="family" mode="prepend" binding="same"> + <string>Samyak Devanagari</string> + </edit> +</match> + +<match> + <test name="lang"> + <string>sa-in</string> + </test> + <test name="family"> + <string>serif</string> + </test> + <edit name="family" mode="prepend" binding="same"> + <string>Samyak Devanagari</string> + </edit> +</match> + <alias> <family>Samyak Devanagari</family> <default>
Index: 67-samyak-gujarati.conf =================================================================== RCS file: /cvs/pkgs/rpms/samyak-fonts/devel/67-samyak-gujarati.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- 67-samyak-gujarati.conf 28 Oct 2009 07:38:24 -0000 1.1 +++ 67-samyak-gujarati.conf 3 Mar 2010 09:56:17 -0000 1.2 @@ -2,13 +2,13 @@ <!DOCTYPE fontconfig SYSTEM "fonts.dtd"> <fontconfig> <match> - <test name="lang" compare="contains"> - <string>gu</string> + <test name="lang"> + <string>gu-in</string> </test> <test name="family"> <string>serif</string> </test> - <edit name="family" mode="prepend_first" binding="same"> + <edit name="family" mode="prepend" binding="same"> <string>Samyak Gujarati</string> </edit> </match>
Index: 67-samyak-oriya.conf =================================================================== RCS file: /cvs/pkgs/rpms/samyak-fonts/devel/67-samyak-oriya.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- 67-samyak-oriya.conf 28 Oct 2009 07:38:24 -0000 1.1 +++ 67-samyak-oriya.conf 3 Mar 2010 09:56:18 -0000 1.2 @@ -2,13 +2,13 @@ <!DOCTYPE fontconfig SYSTEM "fonts.dtd"> <fontconfig> <match> - <test name="lang" compare="contains"> - <string>or</string> + <test name="lang"> + <string>or-in</string> </test> <test name="family"> <string>serif</string> </test> - <edit name="family" mode="prepend_first" binding="same"> + <edit name="family" mode="prepend" binding="same"> <string>Samyak Oriya</string> </edit> </match>
Index: 67-samyak-tamil.conf =================================================================== RCS file: /cvs/pkgs/rpms/samyak-fonts/devel/67-samyak-tamil.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- 67-samyak-tamil.conf 28 Oct 2009 07:38:25 -0000 1.1 +++ 67-samyak-tamil.conf 3 Mar 2010 09:56:18 -0000 1.2 @@ -2,13 +2,13 @@ <!DOCTYPE fontconfig SYSTEM "fonts.dtd"> <fontconfig> <match> - <test name="lang" compare="contains"> - <string>ta</string> + <test name="lang"> + <string>ta-in</string> </test> <test name="family"> <string>serif</string> </test> - <edit name="family" mode="prepend_first" binding="same"> + <edit name="family" mode="prepend" binding="same"> <string>Samyak Tamil</string> </edit> </match>
Index: samyak-fonts.spec =================================================================== RCS file: /cvs/pkgs/rpms/samyak-fonts/devel/samyak-fonts.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -r1.11 -r1.12 --- samyak-fonts.spec 28 Oct 2009 07:38:25 -0000 1.11 +++ samyak-fonts.spec 3 Mar 2010 09:56:18 -0000 1.12 @@ -9,15 +9,16 @@ Scripts Devanagari, Gujarati, Malayalam,
Name: %{fontname}-fonts Version: 1.2.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Free Indian truetype/opentype fonts Group: User Interface/X License: GPLv3+ with exceptions -URL: https://sarovar.org/projects/samyak/ +URL: http://sarovar.org/projects/samyak/ +# Source0: http://sarovar.org/frs/?group_id=461&release_id=821 Source: samyak-fonts-%{version}.tar.gz Source1: 67-samyak-devanagari.conf Source2: 67-samyak-tamil.conf -Source3: 69-samyak-malayalam.conf +Source3: 68-samyak-malayalam.conf Source4: 67-samyak-gujarati.conf Source5: 67-samyak-oriya.conf BuildArch: noarch @@ -28,8 +29,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version %common_desc
%package common -Summary: Common files for smc-fonts -Group: User Interface/X +Summary: Common files for samyak-fonts +Group: User Interface/X Requires: fontpackages-filesystem Provides: %{fontname}-common-fonts = %{version}-%{release} Obsoletes: %{fontname}-common-fonts < 1.2.1-4 @@ -47,7 +48,7 @@ Obsoletes: %{name}-devanagari < 1.2.1-3 This package contains truetype/opentype font for the display of \ Scripts Devanagari.
-%_font_pkg -n devanagari -f %{fontconf}-devanagari.conf %{fontname}-devanagari/Samyak-*.ttf +%_font_pkg -n devanagari -f %{fontconf}-devanagari.conf %{fontname}-devanagari/Samyak-*.ttf
%package -n %{fontname}-tamil-fonts Summary: Open Type Fonts for Tamil script @@ -73,10 +74,10 @@ Obsoletes: %{name}-malayalam < 1.2.1-3 This package contains truetype/opentype font for the display of \ Scripts Malayalam.
-%_font_pkg -n malayalam -f 69-samyak-malayalam.conf %{fontname}-malayalam/*.ttf +%_font_pkg -n malayalam -f 68-samyak-malayalam.conf %{fontname}-malayalam/*.ttf
%package -n %{fontname}-gujarati-fonts -Summary: Open Type Fonts for Gujarai script +Summary: Open Type Fonts for Gujarati script Group: User Interface/X Requires: %{name}-common = %{version}-%{release} License: GPLv3+ with exceptions @@ -118,32 +119,32 @@ install -m 0644 -p $i/* %{buildroot}%{_f done
install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \ - %{buildroot}%{_fontconfig_confdir} + %{buildroot}%{_fontconfig_confdir}
# Repeat for every font family install -m 0644 -p %{SOURCE1} \ - %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-devanagari.conf + %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-devanagari.conf
install -m 0644 -p %{SOURCE2} \ - %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-tamil.conf + %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-tamil.conf
install -m 0644 -p %{SOURCE3} \ - %{buildroot}%{_fontconfig_templatedir}/69-samyak-malayalam.conf + %{buildroot}%{_fontconfig_templatedir}/68-samyak-malayalam.conf
install -m 0644 -p %{SOURCE4} \ - %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-gujarati.conf + %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-gujarati.conf
install -m 0644 -p %{SOURCE5} \ - %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-oriya.conf + %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-oriya.conf
for fconf in %{fontconf}-devanagari.conf \ - %{fontconf}-tamil.conf \ - 69-samyak-malayalam.conf \ - %{fontconf}-gujarati.conf \ - %{fontconf}-oriya.conf ; do + %{fontconf}-tamil.conf \ + 68-samyak-malayalam.conf \ + %{fontconf}-gujarati.conf \ + %{fontconf}-oriya.conf ; do ln -s %{_fontconfig_templatedir}/$fconf \ - %{buildroot}%{_fontconfig_confdir}/$fconf + %{buildroot}%{_fontconfig_confdir}/$fconf done
%clean @@ -156,6 +157,10 @@ rm -fr %{buildroot} %dir %{_fontdir}
%changelog +* Wed Mar 3 2010 Naveen Kumar nkumar@redhat.com 1.2.1-8 +- Updated .conf file +- Resolves Bug#568254 + * Wed Oct 28 2009 Pravin Satpute psatpute@redhat.com 1.2.1-7 - added fontconf files for each subpackage
--- 69-samyak-malayalam.conf DELETED ---
fonts-bugs@lists.fedoraproject.org
-
Naveen Kumar