rpms/smc-fonts/devel smc-fonts.spec,1.2,1.3

Pravin Satpute pravins at fedoraproject.org
Tue Jan 6 09:31:10 UTC 2009


Author: pravins

Update of /cvs/pkgs/rpms/smc-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14333

Modified Files:
	smc-fonts.spec 
Log Message:
* Tue Jan 06 2009 Pravin Satpute <psatpute at redhat.com> 04.1-2
- bugfix 477458
- updated spec



Index: smc-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/smc-fonts/devel/smc-fonts.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- smc-fonts.spec	29 Jul 2008 09:14:48 -0000	1.2
+++ smc-fonts.spec	6 Jan 2009 09:30:39 -0000	1.3
@@ -1,25 +1,38 @@
-%define fontname smc
-%define fontdir %{_datadir}/fonts/%{fontname}
-%define fontconfdir %{_sysconfdir}/fonts/conf.d
+%define	fontname	smc
+%define	fontconf	90-%{fontname}
+
+# Common description
+%define common_desc \
+The smc-fonts package contains fonts for the display of\
+traditional and new Malayalam Script.
 
 Name:	%{fontname}-fonts
 Version:	04.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Open Type Fonts for Malayalam script
 Group:	User Interface/X
 License:	GPLv3+ with exceptions and GPLv2+ with exceptions and GPLv2+ and  GPLv2
 URL:	http://savannah.nongnu.org/projects/smc
 Source:	http://download.savannah.nongnu.org/releases/smc/fonts/malayalam-fonts-%{version}.zip
 BuildArch:	noarch
+BuildRequires: fontpackages-devel
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
-The smc-fonts package contains fonts for the display of
-traditional and new Malayalam Script.
+%common_desc
+
+%package common
+Summary:  Common files for smc-fonts
+Group:  User Interface/X
+Requires: fontpackages-filesystem
+
+%description common
+%common_desc
 
 %package dyuthi
 Summary: Open Type Fonts for Malayalam script
 Group: User Interface/X 
+Requires: %{name}-common = %{version}-%{release}
 License: GPLv3+ with exceptions
 %description dyuthi
 The smc-fonts-dyuthi package contains fonts for the display of
@@ -28,6 +41,7 @@
 %package meera 
 Summary: Open Type Fonts for Malayalam script
 Group: User Interface/X 
+Requires: %{name}-common = %{version}-%{release}
 License: GPLv2+ with exceptions
 %description meera
 The smc-fonts-meera package contains fonts for the display of
@@ -37,6 +51,7 @@
 %package rachana 
 Summary: Open Type Fonts for Malayalam script
 Group: User Interface/X 
+Requires: %{name}-common = %{version}-%{release}
 License: GPLv2+
 %description rachana
 The smc-fonts-rachana package contains fonts for the display of
@@ -46,6 +61,7 @@
 %package raghumalayalam
 Summary: Open Type Fonts for Malayalam script
 Group: User Interface/X 
+Requires: %{name}-common = %{version}-%{release}
 License: GPLv2
 %description raghumalayalam
 The smc-fonts-malayalam package contains fonts for the display of
@@ -54,6 +70,7 @@
 %package suruma
 Summary: Open Type Fonts for Malayalam script
 Group: User Interface/X 
+Requires: %{name}-common = %{version}-%{release}
 License: GPLv3+ with exceptions
 %description suruma
 The smc-fonts-suruma package contains fonts for the display of
@@ -62,6 +79,7 @@
 %package kalyani
 Summary: Open Type Fonts for Malayalam script
 Group: User Interface/X
+Requires: %{name}-common = %{version}-%{release}
 License: GPLv3+ with exceptions
 %description kalyani
 The smc-fonts-suruma package contains fonts for the display of
@@ -70,11 +88,27 @@
 %package anjalioldlipi
 Summary: Open Type Fonts for Malayalam script
 Group: User Interface/X
+Requires: %{name}-common = %{version}-%{release}
 License: GPLv3+ with exceptions
 %description anjalioldlipi
 The smc-fonts-suruma package contains fonts for the display of
 traditional Malayalam Scripts.
 
+#%{_fontdir} is shared by following packages since they all are for malayalam script only
+%_font_pkg -n dyuthi Dyuthi*.ttf 
+
+%_font_pkg -n meera -f 90-%{fontname}-fonts.conf Meera*.ttf 
+
+%_font_pkg -n rachana Rachana*.ttf
+
+%_font_pkg -n raghumalayalam RaghuMalayalamSans*.ttf
+
+%_font_pkg -n suruma suruma*.ttf
+
+%_font_pkg -n kalyani Kalyani*.ttf
+
+%_font_pkg -n anjalioldlipi AnjaliOldLipi.ttf
+
 %prep
 %setup -q -n malayalam-fonts-04
 
@@ -82,145 +116,31 @@
 echo "Nothing to do in Build."
 
 %install
-
 rm -rf %{buildroot}
-install -m 0755 -d %{buildroot}%{fontdir}
-install -m 0644 -p *.ttf  %{buildroot}%{fontdir}
-install -m 0755 -d %{buildroot}%{fontconfdir} 
-install -m 0644 -p $RPM_BUILD_DIR/malayalam-fonts-04/malayalam-fonts.conf %{buildroot}%{fontconfdir}/90-%{fontname}.conf
+install -m 0755 -d %{buildroot}%{_fontdir}
+install -m 0644 -p *.ttf  %{buildroot}%{_fontdir}
+install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
+		%{buildroot}%{_fontconfig_confdir}
+install -m 0644 -p $RPM_BUILD_DIR/malayalam-fonts-04/malayalam-fonts.conf %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-fonts.conf
+for fconf in %{fontconf}-fonts.conf ; do
+  ln -s %{_fontconfig_templatedir}/$fconf \
+	%{buildroot}%{_fontconfig_confdir}/$fconf
+done
 
 %clean
 rm -fr %{buildroot}
 
-%post  dyuthi
-if [ -x %{_bindir}/fc-cache ]; then
-%{_bindir}/fc-cache -f %{fontdir} || :
-fi
-
-%post  meera
-if [ -x %{_bindir}/fc-cache ]; then
-%{_bindir}/fc-cache -f %{fontdir} || :
-fi
-
-%post  rachana
-if [ -x %{_bindir}/fc-cache ]; then
-%{_bindir}/fc-cache -f %{fontdir} || :
-fi
-
-%post  raghumalayalam
-if [ -x %{_bindir}/fc-cache ]; then
-%{_bindir}/fc-cache -f %{fontdir} || :
-fi	
-
-%post  suruma
-if [ -x %{_bindir}/fc-cache ]; then
-%{_bindir}/fc-cache -f %{fontdir} || :
-fi
-
-%post  kalyani
-if [ -x %{_bindir}/fc-cache ]; then
-%{_bindir}/fc-cache -f %{fontdir} || :
-fi
-
-%post  anjalioldlipi
-if [ -x %{_bindir}/fc-cache ]; then
-%{_bindir}/fc-cache -f %{fontdir} || :
-fi
-
-%postun dyuthi
-if [ "$1" = "0" ]; then
-	if [ -x %{_bindir}/fc-cache ]; then
-%{_bindir}/fc-cache -f %{fontdir} || :
-	fi
-fi
-
-%postun meera
-if [ "$1" = "0" ]; then
-	if [ -x %{_bindir}/fc-cache ]; then
-%{_bindir}/fc-cache -f %{fontdir} || :
-	fi
-fi
-
-%postun rachana
-if [ "$1" = "0" ]; then
-	if [ -x %{_bindir}/fc-cache ]; then
-%{_bindir}/fc-cache -f %{fontdir} || :
-	fi
-fi
-
-%postun raghumalayalam
-if [ "$1" = "0" ]; then
-	if [ -x %{_bindir}/fc-cache ]; then
-%{_bindir}/fc-cache -f %{fontdir} || :
-	fi
-fi
-
-%postun suruma
-if [ "$1" = "0" ]; then
-	if [ -x %{_bindir}/fc-cache ]; then
-%{_bindir}/fc-cache -f %{fontdir} || :
-	fi
-fi
-
-%postun kalyani
-if [ "$1" = "0" ]; then
-	if [ -x %{_bindir}/fc-cache ]; then
-%{_bindir}/fc-cache -f %{fontdir} || :
-	fi
-fi
-
-%postun anjalioldlipi
-if [ "$1" = "0" ]; then
-	if [ -x %{_bindir}/fc-cache ]; then
-%{_bindir}/fc-cache -f %{fontdir} || :
-	fi
-fi
 
-#%{fontdir} is shared by following packages since they all are for malayalam script only
-%files dyuthi
+%files common
 %defattr(-,root,root,-) 
 %doc *.txt 
-%dir %{fontdir}
-%{fontdir}/Dyuthi*.ttf 
-
-%files meera
-%defattr(-,root,root,-) 
-%doc *.txt 
-%config(noreplace) %{fontconfdir}/90-%{fontname}.conf 
-%dir %{fontdir}
-%{fontdir}/Meera*.ttf 
-
-%files rachana
-%defattr(-,root,root,-) 
-%doc *.txt 
-%dir %{fontdir}
-%{fontdir}/Rachana*.ttf 
-
-%files raghumalayalam
-%defattr(-,root,root,-) 
-%doc *.txt 
-%dir %{fontdir}
-%{fontdir}/RaghuMalayalamSans*.ttf 
-
-%files suruma
-%defattr(-,root,root,-) 
-%doc *.txt 
-%dir %{fontdir}
-%{fontdir}/suruma*.ttf 
-
-%files kalyani
-%defattr(-,root,root,-)
-%doc *.txt
-%dir %{fontdir}
-%{fontdir}/Kalyani*.ttf
-
-%files anjalioldlipi
-%defattr(-,root,root,-)
-%doc *.txt
-%dir %{fontdir}
-%{fontdir}/AnjaliOldLipi.ttf
+%dir %{_fontdir}
 
 %changelog
+* Tue Jan 06 2009 Pravin Satpute <psatpute at redhat.com> 04.1-2
+- bugfix 477458
+- updated spec
+
 * Tue Jul 29 2008 Pravin Satpute <psatpute at redhat.com> 04.1-1
 - new upstream release
 - fontconfig rule for size adjustment of Meera is added




More information about the Fedora-fonts-bugs-list mailing list