[samyak-fonts] * Tue Nov 16 2010 Naveen Kumar <nkumar at redhat.com> - 1.2.2-3 - rectify error to directly install fon

[Naveen Kumar]

commit 8d94e10897130d14b5a0c928f5c8d78a4fba5884
Author: Naveen Kumar <nkumar at redhat.com>
Date:   Tue Nov 16 19:16:39 2010 +0530

    * Tue Nov 16 2010 Naveen Kumar <nkumar at redhat.com> - 1.2.2-3
    - rectify error to directly install fonts in fontdir instead of subdir in fontdir

 samyak-fonts.spec |   29 +++++++++++------------------
 1 files changed, 11 insertions(+), 18 deletions(-)
---
diff --git a/samyak-fonts.spec b/samyak-fonts.spec
index c54bf7d..dc8a1d4 100644
--- a/samyak-fonts.spec
+++ b/samyak-fonts.spec
@@ -1,6 +1,5 @@
 %define	fontname	samyak
 %global fontconf	67-%{fontname}
-%define langlist	"devanagari gujarati tamil malayalam oriya"
 
 # Common description
 %define common_desc \
@@ -9,7 +8,7 @@ Scripts Devanagari, Gujarati, Malayalam, Oriya and Tamil
 
 Name:	 %{fontname}-fonts
 Version:	1.2.2
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Free Indian truetype/opentype fonts
 Group:	User Interface/X
 License:	GPLv3+ with exceptions
@@ -49,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 Samyak-Devanagari.ttf 
 
 %package -n %{fontname}-tamil-fonts
 Summary: Open Type Fonts for Tamil script
@@ -62,7 +61,7 @@ Obsoletes: %{name}-tamil < 1.2.1-3
 This package contains truetype/opentype font for the display of \
 Scripts Tamil.
 
-%_font_pkg -n tamil -f %{fontconf}-tamil.conf %{fontname}-tamil/*.ttf 
+%_font_pkg -n tamil -f %{fontconf}-tamil.conf Samyak-Tamil.ttf 
 
 %package -n %{fontname}-malayalam-fonts
 Summary: Open Type Fonts for Malayalam script
@@ -75,7 +74,7 @@ Obsoletes: %{name}-malayalam < 1.2.1-3
 This package contains truetype/opentype font for the display of \
 Scripts Malayalam.
 
-%_font_pkg -n malayalam -f 68-samyak-malayalam.conf %{fontname}-malayalam/*.ttf 
+%_font_pkg -n malayalam -f 68-samyak-malayalam.conf Samyak-Malayalam.ttf 
 
 %package -n %{fontname}-gujarati-fonts
 Summary: Open Type Fonts for Gujarati script
@@ -88,7 +87,7 @@ Obsoletes: %{name}-gujarati < 1.2.1-3
 This package contains truetype/opentype font for the display of \
 Scripts Gujarati.
 
-%_font_pkg -n gujarati -f %{fontconf}-gujarati.conf %{fontname}-gujarati/*.ttf 
+%_font_pkg -n gujarati -f %{fontconf}-gujarati.conf Samyak-Gujarati.ttf 
 
 %package -n %{fontname}-oriya-fonts
 Summary: Open Type Fonts for Oriya script
@@ -101,7 +100,7 @@ Obsoletes: %{name}-oriya < 1.2.1-3
 This package contains truetype/opentype font for the display of \
 Scripts Oriya.
 
-%_font_pkg -n oriya -f %{fontconf}-oriya.conf %{fontname}-oriya/*.ttf 
+%_font_pkg -n oriya -f %{fontconf}-oriya.conf Samyak-Oriya.ttf 
 
 
 %prep
@@ -113,17 +112,8 @@ mkdir -p TTFfiles/
 
 %install
 rm -rf %{buildroot}
-cp TTFfiles/Samyak-Devanagari.ttf TTFfiles/devanagari
-cp TTFfiles/Samyak-Gujarati.ttf TTFfiles/gujarati
-cp TTFfiles/Samyak-Malayalam.ttf TTFfiles/malayalam
-cp TTFfiles/Samyak-Oriya.ttf TTFfiles/oriya
-cp TTFfiles/Samyak-Tamil.ttf TTFfiles/tamil
-
-for i in "%{langlist}"
-do
-install -m 0755 -d %{buildroot}%{_fontdir}/samyak-$i
-install -m 0644 -p $i/*.ttf %{buildroot}%{_fontdir}/samyak-$i
-done
+install -m 0755 -d %{buildroot}%{_fontdir}
+install -m 0644 -p TTFfiles/*.ttf %{buildroot}%{_fontdir}
 
 install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
 		%{buildroot}%{_fontconfig_confdir}
@@ -164,6 +154,9 @@ rm -fr %{buildroot}
 %dir %{_fontdir}
 
 %changelog
+* Tue Nov 16 2010 Naveen Kumar <nkumar at redhat.com> - 1.2.2-3
+- rectify error to directly install fonts in fontdir instead of subdir in fontdir
+
 * Thu Jun 10 2010 Naveen Kumar <nkumar at redhat.com> 1.2.2-2
 - OOPS! forgot to add pkg fontforge in BuildRequires