[smc-fonts/f20] Resolves bug #1056845: some packaging issues

[Pravin Satpute]

commit bd7dd4f0fb7daa3de55f0b280eb02bb72aa7e49c
Author: pravins <psatpute at redhat.com>
Date:   Thu Jan 23 13:03:55 2014 +0530

    Resolves bug #1056845: some packaging issues

 smc-fonts.spec |   32 +++++++++++++++++---------------
 1 files changed, 17 insertions(+), 15 deletions(-)
---
diff --git a/smc-fonts.spec b/smc-fonts.spec
index 5f7cc8a..ae55505 100644
--- a/smc-fonts.spec
+++ b/smc-fonts.spec
@@ -1,15 +1,14 @@
-%define	fontname	smc
+%global	fontname	smc
 
 # Common description
-%define common_desc \
+%global common_desc \
 The SMC Fonts package contains fonts for the display of\
 traditional and new Malayalam Script.
 
 Name:		%{fontname}-fonts
 Version:	6.0
-Release:	2%{?dist}
+Release:	7%{?dist}
 Summary:	Open Type Fonts for Malayalam script
-Group:		User Interface/X
 License:	GPLv3+ with exceptions and GPLv2+ with exceptions and GPLv2+ and  GPLv2 and GPL+
 URL:		http://savannah.nongnu.org/projects/smc
 Source0:	http://download.savannah.gnu.org/releases-noredirect/smc/fonts/malayalam-fonts-%{version}.tar.xz
@@ -24,15 +23,14 @@ Source8: AnjaliOldLipi-license-confirmation-email.txt
 BuildArch:	noarch
 BuildRequires:	fontpackages-devel > 1.13
 BuildRequires:	fontforge >= 20080429
+# https://bugzilla.redhat.com/show_bug.cgi?id=803234
 Patch1: bug-803234.patch
-#Patch2: %{name}-bug-873635.patch
 
 %description
 %common_desc
 
 %package common
 Summary:  Common files for smc-fonts
-Group:	User Interface/X
 Requires: fontpackages-filesystem
 
 %description common
@@ -40,7 +38,6 @@ Requires: fontpackages-filesystem
 
 %package -n %{fontname}-dyuthi-fonts
 Summary: Open Type Fonts for Malayalam script
-Group: User Interface/X 
 Requires: %{name}-common = %{version}-%{release}
 License: GPLv3+ with exceptions
 %description -n %{fontname}-dyuthi-fonts
@@ -48,10 +45,10 @@ The Dyuthi font package contains fonts for the display of
 traditional Malayalam Scripts.
 
 %_font_pkg -n dyuthi -f 67-smc-dyuthi.conf Dyuthi*.ttf 
+%doc Dyuthi/COPYING
 
 %package -n %{fontname}-meera-fonts
 Summary: Open Type Fonts for Malayalam script
-Group: User Interface/X 
 Requires: %{name}-common = %{version}-%{release}
 License: GPLv2+ with exceptions
 %description -n %{fontname}-meera-fonts
@@ -64,7 +61,6 @@ traditional Malayalam Scripts.
 
 %package -n %{fontname}-rachana-fonts
 Summary: Open Type Fonts for Malayalam script
-Group: User Interface/X 
 Requires: %{name}-common = %{version}-%{release}
 License: GPLv2+
 %description -n %{fontname}-rachana-fonts
@@ -77,7 +73,6 @@ traditional Malayalam Scripts.
 
 %package -n %{fontname}-raghumalayalam-fonts
 Summary: Open Type Fonts for Malayalam script
-Group: User Interface/X 
 Requires: %{name}-common = %{version}-%{release}
 License: GPLv2
 %description -n %{fontname}-raghumalayalam-fonts
@@ -85,10 +80,10 @@ The SMC Malayalam fonts package contains fonts for the display of
 new Malayalam Scripts.
 
 %_font_pkg -n raghumalayalam -f 67-smc-raghumalayalam.conf RaghuMalayalamSans.ttf
+%doc RaghuMalayalamSans/COPYING
 
 %package -n %{fontname}-suruma-fonts
 Summary: Open Type Fonts for Malayalam script
-Group: User Interface/X 
 Requires: %{name}-common = %{version}-%{release}
 License: GPLv3 with exceptions
 %description -n %{fontname}-suruma-fonts
@@ -96,10 +91,10 @@ The Suruma font package contains fonts for the display of
 traditional Malayalam Scripts.
 
 %_font_pkg -n suruma -f 67-smc-suruma.conf Suruma.ttf
+%doc Suruma/COPYING Suruma/README
 
 %package -n %{fontname}-kalyani-fonts
 Summary: Open Type Fonts for Malayalam script
-Group: User Interface/X
 Requires: %{name}-common = %{version}-%{release}
 License: GPLv3+ with exceptions
 %description -n %{fontname}-kalyani-fonts
@@ -107,10 +102,10 @@ The Kalyani font package contains fonts for the display of
 new Malayalam Scripts.
 
 %_font_pkg -n kalyani -f 67-smc-kalyani.conf Kalyani.ttf
+%doc Kalyani/COPYING
 
 %package -n %{fontname}-anjalioldlipi-fonts
 Summary: Open Type Fonts for Malayalam script
-Group: User Interface/X
 Requires: %{name}-common = %{version}-%{release}
 License: GPL+
 %description -n %{fontname}-anjalioldlipi-fonts
@@ -118,18 +113,21 @@ The Anjali OldLipi package contains fonts for the display of
 traditional Malayalam Scripts.
 
 %_font_pkg -n anjalioldlipi -f 67-smc-anjalioldlipi.conf AnjaliOldLipi.ttf
+%doc AnjaliOldLipi/COPYING
 
-#%%{_fontdir} is shared by following packages since they all are for malayalam script only
 
 %prep
 %setup -q -n fonts
 %patch1 -p1 -b .1-panose-setting
+sed -i 's/\r//' */COPYING
+sed -i 's/\r//' Rachana/LICENSE
 
 %build
 chmod +x generate.pe
 make
 
 %install
+#%%{_fontdir} is shared by all subpackages since they all are for malayalam script only
 install -m 0755 -d %{buildroot}%{_fontdir}
 install -m 0644 -p AnjaliOldLipi/*.ttf %{buildroot}%{_fontdir}
 install -m 0644 -p Dyuthi/*.ttf %{buildroot}%{_fontdir}
@@ -172,7 +170,11 @@ done
 %doc ChangeLog 
 
 %changelog
-* Wed Nov 20 2013 Pravin Satpute <psatpute at redhat.com> 6.0-1
+* Thu Jan 23 2014 Pravin Satpute <psatpute at redhat.com> 6.0-7
+- Resolves bug #1056845: some packaging issues
+- Notice release bump from 2 to 7
+
+* Wed Nov 20 2013 Pravin Satpute <psatpute at redhat.com> 6.0-2
 - Minor git cleanup and spec fixes
 
 * Sat Oct 26 2013 Rajeesh K Nambiar <rajeeshknambiar at fedoraproject.org> 6.0-1