commit a9686fecfc27d5cd625078761b39259bfd95575d Author: प्रविण सातपुते <psatp...@redhat.com> Date: Wed Jun 22 13:49:35 2011 +0530
Resolved bug 714926 ...ak-devanagari.conf => 66-samyak-devanagari.conf | 36 ++++++++++---------- 67-samyak-gujarati.conf | 4 +- 67-samyak-tamil.conf | 4 +- 68-samyak-malayalam.conf | 4 +- samyak-fonts.spec | 13 ++++--- 5 files changed, 32 insertions(+), 29 deletions(-) --- diff --git a/67-samyak-devanagari.conf b/66-samyak-devanagari.conf similarity index 77% rename from 67-samyak-devanagari.conf rename to 66-samyak-devanagari.conf index 4ad02d0..c446a9b 100644 --- a/67-samyak-devanagari.conf +++ b/66-samyak-devanagari.conf @@ -2,8 +2,8 @@ <!DOCTYPE fontconfig SYSTEM "fonts.dtd"> <fontconfig> <match> - <test name="lang"> - <string>hi-in</string> + <test name="lang" compare="contains"> + <string>hi</string> </test> <test name="family"> <string>serif</string> @@ -14,8 +14,8 @@ </match> <match> - <test name="lang"> - <string>mr-in</string> + <test name="lang" compare="contains"> + <string>mr</string> </test> <test name="family"> <string>serif</string> @@ -26,8 +26,8 @@ </match> <match> - <test name="lang"> - <string>kok-in</string> + <test name="lang" compare="contains"> + <string>kok</string> </test> <test name="family"> <string>serif</string> @@ -38,8 +38,8 @@ </match> <match> - <test name="lang"> - <string>ks-in@devanagari</string> + <test name="lang" compare="contains"> + <string>ks@devanagari</string> </test> <test name="family"> <string>serif</string> @@ -62,8 +62,8 @@ </match> <match> - <test name="lang"> - <string>mai-in</string> + <test name="lang" compare="contains"> + <string>mai</string> </test> <test name="family"> <string>serif</string> @@ -74,8 +74,8 @@ </match> <match> - <test name="lang"> - <string>ne-np</string> + <test name="lang" compare="contains"> + <string>ne</string> </test> <test name="family"> <string>serif</string> @@ -86,8 +86,8 @@ </match> <match> - <test name="lang"> - <string>brx-in</string> + <test name="lang" compare="contains"> + <string>brx</string> </test> <test name="family"> <string>serif</string> @@ -98,8 +98,8 @@ </match> <match> - <test name="lang"> - <string>doi-in</string> + <test name="lang" compare="contains"> + <string>doi</string> </test> <test name="family"> <string>serif</string> @@ -110,8 +110,8 @@ </match> <match> - <test name="lang"> - <string>sa-in</string> + <test name="lang" compare="contains"> + <string>sa</string> </test> <test name="family"> <string>serif</string> diff --git a/67-samyak-gujarati.conf b/67-samyak-gujarati.conf index 18b4f74..26fe037 100644 --- a/67-samyak-gujarati.conf +++ b/67-samyak-gujarati.conf @@ -2,8 +2,8 @@ <!DOCTYPE fontconfig SYSTEM "fonts.dtd"> <fontconfig> <match> - <test name="lang"> - <string>gu-in</string> + <test name="lang" compare="contains"> + <string>gu</string> </test> <test name="family"> <string>serif</string> diff --git a/67-samyak-tamil.conf b/67-samyak-tamil.conf index cf5a368..c0c9698 100644 --- a/67-samyak-tamil.conf +++ b/67-samyak-tamil.conf @@ -2,8 +2,8 @@ <!DOCTYPE fontconfig SYSTEM "fonts.dtd"> <fontconfig> <match> - <test name="lang"> - <string>ta-in</string> + <test name="lang" compare="contains"> + <string>ta</string> </test> <test name="family"> <string>serif</string> diff --git a/68-samyak-malayalam.conf b/68-samyak-malayalam.conf index 3c24404..3743bf3 100644 --- a/68-samyak-malayalam.conf +++ b/68-samyak-malayalam.conf @@ -2,8 +2,8 @@ <!DOCTYPE fontconfig SYSTEM "fonts.dtd"> <fontconfig> <match> - <test name="lang"> - <string>ml-in</string> + <test name="lang" compare="contains"> + <string>ml</string> </test> <test name="family"> <string>serif</string> diff --git a/samyak-fonts.spec b/samyak-fonts.spec index bab33c8..f03afd4 100644 --- a/samyak-fonts.spec +++ b/samyak-fonts.spec @@ -8,14 +8,14 @@ Scripts Devanagari, Gujarati, Malayalam, Oriya and Tamil Name: %{fontname}-fonts Version: 1.2.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Free Indian truetype/opentype fonts Group: User Interface/X License: GPLv3+ with exceptions 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 +Source1: 66-samyak-devanagari.conf Source2: 67-samyak-tamil.conf Source3: 68-samyak-malayalam.conf Source4: 67-samyak-gujarati.conf @@ -48,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 Samyak-Devanagari.ttf +%_font_pkg -n devanagari -f 66-samyak-devanagari.conf Samyak-Devanagari.ttf %package -n %{fontname}-tamil-fonts Summary: Open Type Fonts for Tamil script @@ -120,7 +120,7 @@ install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \ # Repeat for every font family install -m 0644 -p %{SOURCE1} \ - %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-devanagari.conf + %{buildroot}%{_fontconfig_templatedir}/66-samyak-devanagari.conf install -m 0644 -p %{SOURCE2} \ %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-tamil.conf @@ -135,7 +135,7 @@ install -m 0644 -p %{SOURCE5} \ %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-oriya.conf -for fconf in %{fontconf}-devanagari.conf \ +for fconf in 66-samyak-devanagari.conf \ %{fontconf}-tamil.conf \ 68-samyak-malayalam.conf \ %{fontconf}-gujarati.conf \ @@ -154,6 +154,9 @@ rm -fr %{buildroot} %dir %{_fontdir} %changelog +* Wed Jun 22 2011 Pravin Satpute <psatp...@redhat.com> 1.2.2-5 +- Resolved bug 714926 + * Wed Feb 09 2011 Fedora Release Engineering <rel-...@lists.fedoraproject.org> - 1.2.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild _______________________________________________ fonts-bugs mailing list fonts-bugs@lists.fedoraproject.org https://admin.fedoraproject.org/mailman/listinfo/fonts-bugs http://fonts.fedoraproject.org/