Author: oget Update of /cvs/nonfree/rpms/larabie-fonts/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv27199 Modified Files: larabie-fonts.spec Log Message: * Wed Jan 21 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0-0.3.20011216 - Update package to meet new font packaging and naming guidelines Index: larabie-fonts.spec =================================================================== RCS file: /cvs/nonfree/rpms/larabie-fonts/devel/larabie-fonts.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- larabie-fonts.spec 4 Dec 2008 17:37:04 -0000 1.1 +++ larabie-fonts.spec 22 Jan 2009 03:07:50 -0000 1.2 @@ -1,12 +1,14 @@ -%define decodir %{_datadir}/fonts/%{name}-deco -%define straightdir %{_datadir}/fonts/%{name}-straight -%define uncommondir %{_datadir}/fonts/%{name}-uncommon -%define catalogue %{_sysconfdir}/X11/fontpath.d +%define fontname larabie + +%define common_desc \ +Larabie Fonts offer hundreds of free fonts for personal and commercial use in\ +TrueType format. They consist of three collections: "decorative", "straight",\ +"uncommon" fonts, created by Ray Larabie. Summary: A Collection of High Quality TrueType Fonts -Name: larabie-fonts +Name: %{fontname}-fonts Version: 0 -Release: 0.2.20011216%{?dist} +Release: 0.3.20011216%{?dist} License: Larabie Fonts License Group: User Interface/X URL: http://www.larabiefonts.com/ @@ -16,52 +18,69 @@ # good collection and is borrowed from Ubuntu: # File downloaded from: # https://launchpad.net/ubuntu/jaunty/+source/ttf-larabie/1:20011216-1.1 -Source0: ttf-larabie_20011216.orig.tar.gz +Source0: ttf-%{fontname}_20011216.orig.tar.gz # This file sorts the fonts into families. Extracted from the build # scripts of Ubuntu (same location as above): Source1: %{name}.sort BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildArch: noarch -BuildRequires: xorg-x11-font-utils - +BuildRequires: fontpackages-devel %description -Larabie Fonts offer hundreds of free fonts for personal and -commercial use in TrueType format. This is a meta-package -to install "decorative", "straight", "uncommon" TrueType -font collections, created by Ray Larabie. +%common_desc + +%package common +Summary: Common files for %{name} +Group: User Interface/X +Requires: fontpackages-filesystem + +%description common +%common_desc -%package deco +This package consists of files used by other %{name} packages. + +%package -n %{fontname}-decorative-fonts Summary: Larabie TrueType Decorative Fonts Group: User Interface/X +Requires: %{name}-common = %{version}-%{release} +Obsoletes: %{fontname}-fonts-deco < 0-0.3.20011216 +Provides: %{fontname}-fonts-deco = 0-0.3.20011216 + +%description -n %{fontname}-decorative-fonts +%common_desc -%description deco -Decorative freeware TrueType fonts from Ray Larabie. -This package contains the "decorative" ones of his fonts, -which are great for headlines and other decorations. +This package contains the "decorative" ones of his fonts, which are great for +headlines and other decorations. -%package straight +%package -n %{fontname}-straight-fonts Summary: Larabie TrueType Straight Fonts Group: User Interface/X +Requires: %{name}-common = %{version}-%{release} +Obsoletes: %{fontname}-fonts-straight < 0-0.3.20011216 +Provides: %{fontname}-fonts-straight = 0-0.3.20011216 + +%description -n %{fontname}-straight-fonts +%common_desc -%description straight -Useful freeware TrueType fonts from Ray Larabie. This -package contains the "straight"er ones of his fonts, -which are suitable for everyday use. +This package contains the "straight"er ones of his fonts, which are suitable +for everyday use. -%package uncommon +%package -n %{fontname}-uncommon-fonts Summary: Larabie TrueType Uncommon Fonts Group: User Interface/X +Requires: %{name}-common = %{version}-%{release} +Obsoletes: %{fontname}-fonts-uncommon < 0-0.3.20011216 +Provides: %{fontname}-fonts-uncommon = 0-0.3.20011216 -%description uncommon -Less common freeware TrueType fonts from Ray Larabie. -This package contains fonts which are beautiful for -special decorations and headlines. +%description -n %{fontname}-uncommon-fonts +%common_desc + +This package contains less common fonts which are beautiful for special +decorations and headlines. %prep -%setup -q -n ttf-larabie-20011216 -#patch0 -p1 +%setup -q -n ttf-%{fontname}-20011216 SORTFILE=%{SOURCE1} groups=`cut -f2 $SORTFILE | sort -u` @@ -103,7 +122,6 @@ mv -f tmpfile "$txtfile" done - %build echo "Nothing to build." @@ -111,93 +129,42 @@ %install rm -rf %{buildroot} # fonts -install -m 0755 -d %{buildroot}%{decodir} -install -m 0755 -d %{buildroot}%{straightdir} -install -m 0755 -d %{buildroot}%{uncommondir} -install -pm 0644 deco/*.ttf %{buildroot}%{decodir} -install -pm 0644 straight/*.ttf %{buildroot}%{straightdir} -install -pm 0644 uncommon/*.ttf %{buildroot}%{uncommondir} - -# catalogue -install -m 0755 -d %{buildroot}%{catalogue} -ln -sf ../../../%{decodir} %{buildroot}%{catalogue} -ln -sf ../../../%{straightdir} %{buildroot}%{catalogue} -ln -sf ../../../%{uncommondir} %{buildroot}%{catalogue} - -# generate fonts.dir and fonts.scale -mkfontdir %{buildroot}%{decodir} -mkfontscale %{buildroot}%{decodir} -mkfontdir %{buildroot}%{straightdir} -mkfontscale %{buildroot}%{straightdir} -mkfontdir %{buildroot}%{uncommondir} -mkfontscale %{buildroot}%{uncommondir} - +install -m 0755 -d %{buildroot}%{_fontdir}/decorative +install -m 0755 -d %{buildroot}%{_fontdir}/straight +install -m 0755 -d %{buildroot}%{_fontdir}/uncommon +install -pm 0644 deco/*.ttf %{buildroot}%{_fontdir}/decorative +install -pm 0644 straight/*.ttf %{buildroot}%{_fontdir}/straight +install -pm 0644 uncommon/*.ttf %{buildroot}%{_fontdir}/uncommon %clean rm -rf %{buildroot} - -%post deco -if [ -x /usr/bin/fc-cache ]; then - %{_bindir}/fc-cache %{_datadir}/fonts || : -fi - -%postun deco -if [ "$1" = "0" ]; then - if [ -x /usr/bin/fc-cache ]; then - %{_bindir}/fc-cache %{_datadir}/fonts || : - fi -fi - -%post straight -if [ -x /usr/bin/fc-cache ]; then - %{_bindir}/fc-cache %{_datadir}/fonts || : -fi - -%postun straight -if [ "$1" = "0" ]; then - if [ -x /usr/bin/fc-cache ]; then - %{_bindir}/fc-cache %{_datadir}/fonts || : - fi -fi - -%post uncommon -if [ -x /usr/bin/fc-cache ]; then - %{_bindir}/fc-cache %{_datadir}/fonts || : -fi - -%postun uncommon -if [ "$1" = "0" ]; then - if [ -x /usr/bin/fc-cache ]; then - %{_bindir}/fc-cache %{_datadir}/fonts || : - fi -fi - - -%files deco +%files common %defattr(-,root,root,-) %doc READ_ME.TXT -%{decodir} -%{catalogue}/%{name}-deco +%dir %{_fontdir} -%files straight -%defattr(-,root,root,-) -%doc READ_ME.TXT straight/*.txt -%{straightdir} -%{catalogue}/%{name}-straight -%files uncommon -%defattr(-,root,root,-) -%doc READ_ME.TXT uncommon/*.txt -%{uncommondir} -%{catalogue}/%{name}-uncommon +%_font_pkg -n decorative decorative/*.ttf +%dir %{_fontdir}/decorative + +%_font_pkg -n straight straight/*.ttf +%doc straight/*.txt +%dir %{_fontdir}/straight + +%_font_pkg -n uncommon uncommon/*.ttf +%doc uncommon/*.txt +%dir %{_fontdir}/uncommon %changelog -* Sun Nov 30 2008 Orcan Ogetbil <orcanbahri [AT] yahoo [DOT] com> - 0-0.2.20011216 +* Wed Jan 21 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0-0.3.20011216 +- Update package to meet new font packaging and naming guidelines + +* Sun Nov 30 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0-0.2.20011216 - Added the source download location as a comment. - Preserve timestamps for the fonts. - Removed the meta-package. - Extracted the relevant parts from the Ubuntu's build script -* Mon Nov 24 2008 Orcan Ogetbil <orcanbahri [AT] yahoo [DOT] com> - 0-0.1.20011216 +* Mon Nov 24 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0-0.1.20011216 - Initial release.