diff --git a/SRPMS/msttcorefonts/msttcorefonts.spec.in b/SRPMS/msttcorefonts/msttcorefonts.spec.in index da1ce15..334877d 100644 --- a/SRPMS/msttcorefonts/msttcorefonts.spec.in +++ b/SRPMS/msttcorefonts/msttcorefonts.spec.in @@ -12,7 +12,7 @@ %define fontdir %{_datadir}/fonts/%{name} %define name msttcorefonts -Name: %{name} +Name: msttcorefonts Version: @SRPMVERSION@ Release: @SRPMRELEASE@ Summary: TrueType core fonts for the web @@ -23,11 +23,10 @@ Packager: Silvan Calarco URL: http://corefonts.sourceforge.net/ Source: LICENSE License: Spec file is GPL, binary rpm is gratis but non-distributable -BuildPrereq: wget, cabextract -PreReq: /usr/bin/fc-cache -# BuildPrereq: %{ttmkfdir} +BuildRequires: wget +BuildRequires: cabextract +Requires(post): /usr/bin/fc-cache BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-root %description The TrueType core fonts for the web that was once available from http://www.microsoft.com/typography/fontpack/. The src rpm is cleverly constructed so that the actual fonts are downloaded from Sourceforge's site at build time. Therefore this package technically does not 'redistribute' the fonts, it just makes it easy to install them on a linux system. @@ -61,9 +60,9 @@ for i in $fonts; do wget -nv --timeout=10 --tries=2 ${MSTTCF_URL}/$i 2>&1 done -[ "${HAS_MS_LICENSE}" = "yes" ] && - wget -nv --timeout=10 --tries=2 \ -http://download.microsoft.com/download/ie6sp1/finrel/6_sp1/W98NT42KMeXP/EN-US/IELPKTH.CAB +#[ "${HAS_MS_LICENSE}" = "yes" ] && +# wget -nv --timeout=10 --tries=2 \ +#http://download.microsoft.com/download/ie6sp1/finrel/6_sp1/W98NT42KMeXP/EN-US/IELPKTH.CAB %build cd %{name} @@ -97,8 +96,8 @@ exit 0 exit 0 %files -%attr(-,root,root) %{fontdir} %dir %{fontdir} +%attr(-,root,root) %{fontdir}/* %changelog * Wed Jun 01 2011 Silvan Calarco 1.3-7mamba @@ -114,7 +113,7 @@ exit 0 * Mon Feb 23 2004 Davide Madrisan 1.3-4qilnx - added missing preun script -* Mon Oct 03 2003 Silvan Calarco 1.3-3qilnx +* Fri Oct 03 2003 Silvan Calarco 1.3-3qilnx - removed XFree configuration (these fonts are handled now by fontconfig) * Wed Oct 01 2003 Davide Madrisan 1.3-2qilnx @@ -159,5 +158,5 @@ exit 0 - removed cabextact from this package - added tahoma font from ie5.5 update -* Fri Aug 25 2001 Daniel Resare +* Sat Aug 25 2001 Daniel Resare - initial version