Author: cchance Update of /cvs/pkgs/rpms/liberation-fonts/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv455
Modified Files: liberation-fonts.spec Log Message: resolves: rhbz#477410 updated .spec w/ new renaming Index: liberation-fonts.spec =================================================================== RCS file: /cvs/pkgs/rpms/liberation-fonts/devel/liberation-fonts.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- liberation-fonts.spec 19 Jan 2009 05:42:39 -0000 1.28 +++ liberation-fonts.spec 19 Jan 2009 06:08:16 -0000 1.29 @@ -20,6 +20,9 @@ Group: User Interface/X URL: https://www.redhat.com/promo/fonts/ Source0: liberation-fonts-1.04.93.devel.tar.gz +Source1: 65-liberation-sans.conf +Source2: 65-liberation-serif.conf +Source3: 65-liberation-mono.conf Requires: %{name}-sans >= %{version}-%{release} Requires: %{name}-serif >= %{version}-%{release} @@ -59,32 +62,56 @@ %verify(not md5 size mtime) %{_fontdir}/fonts.scale %{catalogue}/%{name} -%define mk_pkg()\ -%package -n %{fontname}-%1-fonts\ -Summary: %3 fonts to replace commonly used Microsoft %4\ -License: Liberation\ -Group: User Interface/X\ -Obsoletes: %{name}-%1 < %{version}-%{release}\ -Requires: fontpackages-filesystem >= 1.13\ -Requires: %{fontname}-common-fonts = %{version}-%{release}\ -\ -%description -n %{fontname}-%1-fonts\ -%common_desc\ -\ -This is %3 TrueType fonts that replaced commonly used Microsoft %4.\ -\ -%_font_pkg -n %1 -f *-%{fontname}-%1*.conf Liberation%2-*.ttf - -%mk_pkg sans Sans Sans Arial -%mk_pkg serif Serif Sans-serif Times_New_Roman -%mk_pkg mono Mono Monospace Courier_New +%package -n %{fontname}-sans-fonts +Summary: Sans fonts to replace commonly used Microsoft Arial +License: Liberation +Group: User Interface/X +Obsoletes: %{name}-sans < %{version}-%{release} +Requires: fontpackages-filesystem >= 1.13 +Requires: %{fontname}-common-fonts = %{version}-%{release} + +%description -n %{fontname}-sans-fonts +%common_desc + +This is Sans TrueType fonts that replaced commonly used Microsoft Arial. + +%_font_pkg -n sans -f 65-%{fontname}-sans.conf LiberationSans-*.ttf + +%package -n %{fontname}-serif-fonts +Summary: San-serif fonts to replace commonly used Microsoft Times New Roman +License: Liberation +Group: User Interface/X +Obsoletes: %{name}-serif < %{version}-%{release} +Requires: fontpackages-filesystem >= 1.13 +Requires: %{fontname}-common-fonts = %{version}-%{release} + +%description -n %{fontname}-serif-fonts +%common_desc + +This is Sans-serif TrueType fonts that replaced commonly used Microsoft Times \ +New Roman. + +%_font_pkg -n serif -f 65-%{fontname}-serif.conf LiberationSerif-*.ttf + +%package -n %{fontname}-mono-fonts +Summary: Monospace fonts to replace commonly used Microsoft Courier New +License: Liberation +Group: User Interface/X +Obsoletes: %{name}-sans < %{version}-%{release} +Requires: fontpackages-filesystem >= 1.13 +Requires: %{fontname}-common-fonts = %{version}-%{release} + +%description -n %{fontname}-mono-fonts +%common_desc + +This is Monospace TrueType fonts that replaced commonly used Microsoft Courier \ +New. + +%_font_pkg -n mono -f 65-%{fontname}-mono.conf LiberationMono-*.ttf %prep %setup -q -n %{name}-%{version}.devel -%clean -rm -rf %{buildroot} - %build %{nil} @@ -94,7 +121,16 @@ install -m 0755 -d %{buildroot}%{_fontdir} install -m 0644 *.ttf %{buildroot}%{_fontdir} # fontconfig .conf -install -m 0755 -d %{buildroot}%{_sysconfdir}/fonts/conf.d +%__install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} +%__install -m 0755 -d %{buildroot}%{_fontconfig_confdir} +cd ../ +for fconf in %{SOURCE1} %{SOURCE2} %{SOURCE3} +do + %__install -m 0644 $fconf %{buildroot}%{_fontconfig_templatedir}/ + %__ln_s %{_fontconfig_templatedir}/`basename $fconf` \ + %{buildroot}%{_fontconfig_confdir}/`basename $fconf` +done +cd - # catalogue install -d %{buildroot}%{catalogue} ln -sf %{_fontdir} %{buildroot}%{catalogue}/%{name} @@ -102,6 +138,9 @@ mkfontdir %{buildroot}%{_fontdir} mkfontscale %{buildroot}%{_fontdir} +%clean +rm -rf %{buildroot} + %changelog * Mon Jan 19 2009 Caius Chance <ccha...@redhat.com> - 1.04.93-4.fc11 - Resolves: thbz#477410 _______________________________________________ Fedora-fonts-bugs-list mailing list Fedora-fonts-bugs-list@redhat.com https://www.redhat.com/mailman/listinfo/fedora-fonts-bugs-list