rpms/fonts-indic/devel fonts-indic.spec,1.27,1.28
Rahul Bhalerao (rbhalera)
fedora-extras-commits at redhat.com
Fri Jul 27 09:27:39 UTC 2007
Author: rbhalera
Update of /cvs/pkgs/rpms/fonts-indic/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15300
Modified Files:
fonts-indic.spec
Log Message:
SPEC cleanup for merge review
Index: fonts-indic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fonts-indic/devel/fonts-indic.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- fonts-indic.spec 26 Mar 2007 07:24:05 -0000 1.27
+++ fonts-indic.spec 27 Jul 2007 09:27:07 -0000 1.28
@@ -4,7 +4,7 @@
Name: fonts-indic
Version: 2.1.5
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPL
Group: User Interface/X
BuildArch: noarch
@@ -17,87 +17,47 @@
This package provides the Hindi, Bengali, Gujarati, Punjabi, Tamil,
Kannada, Malayalam, Oriya, Telugu TrueType/Opentype fonts.
-
-%package -n fonts-bengali
-Summary: Free Bengali truetype fonts
-Group: User Interface/X
-Obsoletes: ttfonts-bn <= 1.6-1
-Provides : ttfonts-bn <= 1.6-1
-Requires: fontconfig
-%description -n fonts-bengali
-These are the free Bengali truetype/opentype fonts.
-
-%package -n fonts-gujarati
-Summary: Free Gujarati truetype fonts
-Group: User Interface/X
-Obsoletes: ttfonts-gu <= 1.6-1
-Provides : ttfonts-gu <= 1.6-1
-Requires: fontconfig
-%description -n fonts-gujarati
-These are the free Gujarati truetype/opentype fonts.
-
-%package -n fonts-hindi
-Summary: Free Hindi truetype fonts
-Group: User Interface/X
-Obsoletes: ttfonts-hi <= 1.6-1
-Provides : ttfonts-hi <= 1.6-1
-Requires: fontconfig
-%description -n fonts-hindi
-These are the free Hindi truetype/opentype fonts.
-
-%package -n fonts-punjabi
-Summary: Free Punjabi truetype fonts
-Group: User Interface/X
-Obsoletes: ttfonts-pa <= 1.6-1
-Provides : ttfonts-pa <= 1.6-1
-Requires: fontconfig
-%description -n fonts-punjabi
-These are the free Punjabi truetype/opentype fonts.
-
-%package -n fonts-tamil
-Summary: Free Tamil truetype fonts
-Group: User Interface/X
-Obsoletes: ttfonts-ta <= 1.6-1
-Provides : ttfonts-ta <= 1.6-1
-Requires: fontconfig
-%description -n fonts-tamil
-These are the free Tamil truetype/opentype fonts.
-
-%package -n fonts-kannada
-Summary: Free Kannada truetype fonts
-Group: User Interface/X
-Obsoletes: ttfonts-kn <= 1.6-1
-Provides : ttfonts-kn <= 1.6-1
-Requires: fontconfig
-%description -n fonts-kannada
-These are the free Kannada truetype/opentype fonts.
-
-%package -n fonts-malayalam
-Summary: Free Malayalam truetype fonts
-Group: User Interface/X
-Obsoletes: ttfonts-ml <= 1.6-1
-Provides : ttfonts-ml <= 1.6-1
-Requires: fontconfig
-%description -n fonts-malayalam
-These are the free Malayalam truetype/opentype fonts.
-
-%package -n fonts-oriya
-Summary: Free Oriya truetype fonts
-Group: User Interface/X
-Obsoletes: ttfonts-or <= 1.6-1
-Provides : ttfonts-or <= 1.6-1
-Requires: fontconfig
-%description -n fonts-oriya
-These are the free Oriya truetype/opentype fonts.
-
-%package -n fonts-telugu
-Summary: Free Telugu truetype fonts
-Group: User Interface/X
-Obsoletes: ttfonts-te <= 1.6-1
-Provides : ttfonts-te <= 1.6-1
-Requires: fontconfig
-%description -n fonts-telugu
-These are the free Telugu truetype/opentype fonts.
+# mk_pkg <name> <lang-code>
+%define mk_pkg() \
+%package -n fonts-%1\
+Summary: Free %(echo %1 | sed -e "s/\\(.*\\)/\\u\\1/")\
+Group: User Interface/X \
+Obsoletes: ttfonts-%2 <= 1.6-1\
+Provides : ttfonts-%2 <= 1.6-1\
+Requires: fontconfig\
+\
+%description -n fonts-%1\
+These are the free %(echo %1 | sed -e "s/\\(.*\\)/\\u\\1/") truetype/opentype fonts \
+\
+%files -n fonts-%1\
+%defattr(-, root, root)\
+%dir %{xfontdir}\
+%dir %{xfontdir}/%1\
+%doc COPYING README AUTHORS\
+%ghost %{xfontdir}/%1/fonts.cache-1\
+%{xfontdir}/%1/*ttf\
+\
+%post -n fonts-%1 \
+if [ -x %{_bindir}/fc-cache ]; then \
+ %{_bindir}/fc-cache /usr/share/fonts \
+fi \
+\
+%postun -n fonts-%1 \
+if [ "$1" = "0" ]; then \
+ if [ -x %{_bindir}/fc-cache ]; then \
+ %{_bindir}/fc-cache /usr/share/fonts \
+ fi \
+fi
+
+%mk_pkg bengali bn
+%mk_pkg gujarati gu
+%mk_pkg hindi hi
+%mk_pkg kannada kn
+%mk_pkg malayalam ml
+%mk_pkg oriya or
+%mk_pkg punjabi pn
+%mk_pkg tamil ta
+%mk_pkg telugu te
%prep
%setup -q
@@ -119,154 +79,10 @@
%clean
rm -rf $RPM_BUILD_ROOT
-%post -n fonts-bengali
-[ -x %{update_cache} ] && HOME=/ %{update_cache} -f %{xfontdir} 2> /dev/null
-
-%post -n fonts-gujarati
-[ -x %{update_cache} ] && HOME=/ %{update_cache} -f %{xfontdir} 2> /dev/null
-
-%post -n fonts-hindi
-[ -x %{update_cache} ] && HOME=/ %{update_cache} -f %{xfontdir} 2> /dev/null
-
-%post -n fonts-punjabi
-[ -x %{update_cache} ] && HOME=/ %{update_cache} -f %{xfontdir} 2> /dev/null
-
-%post -n fonts-tamil
-[ -x %{update_cache} ] && HOME=/ %{update_cache} -f %{xfontdir} 2> /dev/null
-
-%post -n fonts-kannada
-[ -x %{update_cache} ] && HOME=/ %{update_cache} -f %{xfontdir} 2> /dev/null
-
-%post -n fonts-malayalam
-[ -x %{update_cache} ] && HOME=/ %{update_cache} -f %{xfontdir} 2> /dev/null
-
-%post -n fonts-oriya
-[ -x %{update_cache} ] && HOME=/ %{update_cache} -f %{xfontdir} 2> /dev/null
-
-%post -n fonts-telugu
-[ -x %{update_cache} ] && HOME=/ %{update_cache} -f %{xfontdir} 2> /dev/null
-
-
-
-%postun -n fonts-bengali
-if [ "$1" = "0" ]; then
- [ -x %{update_cache} ] && HOME=/ %{update_cache} -f %{xfontdir} 2> /dev/null
-fi
-
-%postun -n fonts-gujarati
-if [ "$1" = "0" ]; then
- [ -x %{update_cache} ] && HOME=/ %{update_cache} -f %{xfontdir} 2> /dev/null
-fi
-
-%postun -n fonts-hindi
-if [ "$1" = "0" ]; then
- [ -x %{update_cache} ] && HOME=/ %{update_cache} -f %{xfontdir} 2> /dev/null
-fi
-
-%postun -n fonts-punjabi
-if [ "$1" = "0" ]; then
- [ -x %{update_cache} ] && HOME=/ %{update_cache} -f %{xfontdir} 2> /dev/null
-fi
-
-%postun -n fonts-tamil
-if [ "$1" = "0" ]; then
- [ -x %{update_cache} ] && HOME=/ %{update_cache} -f %{xfontdir} 2> /dev/null
-fi
-
-%postun -n fonts-kannada
-if [ "$1" = "0" ]; then
- [ -x %{update_cache} ] && HOME=/ %{update_cache} -f %{xfontdir} 2> /dev/null
-fi
-
-%postun -n fonts-malayalam
-if [ "$1" = "0" ]; then
- [ -x %{update_cache} ] && HOME=/ %{update_cache} -f %{xfontdir} 2> /dev/null
-fi
-
-%postun -n fonts-oriya
-if [ "$1" = "0" ]; then
- [ -x %{update_cache} ] && HOME=/ %{update_cache} -f %{xfontdir} 2> /dev/null
-fi
-
-%postun -n fonts-telugu
-if [ "$1" = "0" ]; then
- [ -x %{update_cache} ] && HOME=/ %{update_cache} -f %{xfontdir} 2> /dev/null
-fi
-
-
-%files -n fonts-bengali
-%defattr(-, root, root)
-%dir %{xfontdir}
-%dir %{xfontdir}/bengali
-%doc COPYING README AUTHORS
-%ghost %{xfontdir}/bengali/fonts.cache-1
-%{xfontdir}/bengali/*ttf
-
-%files -n fonts-gujarati
-%defattr(-, root, root)
-%dir %{xfontdir}
-%dir %{xfontdir}/gujarati
-%doc COPYING README AUTHORS
-%ghost %{xfontdir}/gujarati/fonts.cache-1
-%{xfontdir}/gujarati/*ttf
-
-%files -n fonts-hindi
-%defattr(-, root, root)
-%dir %{xfontdir}
-%dir %{xfontdir}/hindi
-%doc COPYING README AUTHORS
-%ghost %{xfontdir}/hindi/fonts.cache-1
-%{xfontdir}/hindi/*ttf
-
-%files -n fonts-punjabi
-%defattr(-, root, root)
-%dir %{xfontdir}
-%dir %{xfontdir}/punjabi
-%doc COPYING README AUTHORS
-%ghost %{xfontdir}/punjabi/fonts.cache-1
-%{xfontdir}/punjabi/*ttf
-
-%files -n fonts-tamil
-%defattr(-, root, root)
-%dir %{xfontdir}
-%dir %{xfontdir}/tamil
-%doc COPYING README AUTHORS
-%ghost %{xfontdir}/tamil/fonts.cache-1
-%{xfontdir}/tamil/*ttf
-
-%files -n fonts-kannada
-%defattr(-, root, root)
-%dir %{xfontdir}
-%dir %{xfontdir}/kannada
-%doc COPYING README AUTHORS
-%ghost %{xfontdir}/kannada/fonts.cache-1
-%{xfontdir}/kannada/*ttf
-
-%files -n fonts-malayalam
-%defattr(-, root, root)
-%dir %{xfontdir}
-%dir %{xfontdir}/malayalam
-%doc COPYING README AUTHORS
-%ghost %{xfontdir}/malayalam/fonts.cache-1
-%{xfontdir}/malayalam/*ttf
-
-%files -n fonts-oriya
-%defattr(-, root, root)
-%dir %{xfontdir}
-%dir %{xfontdir}/oriya
-%doc COPYING README AUTHORS
-%ghost %{xfontdir}/oriya/fonts.cache-1
-%{xfontdir}/oriya/*ttf
-
-%files -n fonts-telugu
-%defattr(-, root, root)
-%dir %{xfontdir}
-%dir %{xfontdir}/telugu
-%doc COPYING README AUTHORS
-%ghost %{xfontdir}/telugu/fonts.cache-1
-%{xfontdir}/telugu/*ttf
-
%changelog
+* Fri Jul 27 2007 Rahul Bhalerao <rbhalera at redhat.com> - 2.1.5-2.fc8
+- SPEC cleanup as part of merge review #225763
+
* Mon Mar 26 2007 Parag Nemade <pnemade at redhat.com> - 2.1.5
- Resolved Bugs from Parag Nemade
- Bug 231965: [kn_IN] wrong Conjuct combines during the formation kannada letter [yo]
More information about the fedora-extras-commits
mailing list