From 58fc706a0f2c47361adf67d2103b4bd4512ff3c8 Mon Sep 17 00:00:00 2001 From: nim Date: Wed, 17 Dec 2008 20:11:02 +0000 Subject: [PATCH] update for new fonts guidelines --- .cvsignore | 2 +- dejavu-fonts.spec | 149 ++++++++++++++++++++++++++-------------------- import.log | 1 + sources | 2 +- 4 files changed, 86 insertions(+), 68 deletions(-) diff --git a/.cvsignore b/.cvsignore index e4beae0..db4fcba 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -dejavu-fonts-2.26.tar.bz2 +dejavu-fonts-2.27.tar.bz2 diff --git a/dejavu-fonts.spec b/dejavu-fonts.spec index 3dcd933..1f70b45 100644 --- a/dejavu-fonts.spec +++ b/dejavu-fonts.spec @@ -1,7 +1,4 @@ %define fontname dejavu -%define fontdir %{_datadir}/fonts/%{fontname}/ -%define fontconfdir %{_sysconfdir}/fonts/conf.d/ - %define archivename %{name}-%{archiveversion} #define alphatag .20080512svn2226 @@ -11,8 +8,8 @@ %define archiveversion %{version} # Let the perl maintainer worry about Unicode.org data files -%define Blocks %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/Blocks.txt -%define UnicodeData %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/UnicodeData.txt +%define Blocks %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/Blocks.txt +%define UnicodeData %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/UnicodeData.txt # Common description %define common_desc \ @@ -26,66 +23,34 @@ This package only exists to help transition pre 2.26-3 DejaVu users to the new\ package split. It will be removed after one distribution release cycle, please\ do not reference it or depend on it in any way.\ \ -It can be safely uninstalled. +It can be safely uninstalled. -# Subpackage magic - should be generic enough for reuse in other packages -%define font_subpkg(n:f:) \ -\ -%post %{-n*} \ -if [ -x %{_bindir}/fc-cache ]; then \ - %{_bindir}/fc-cache %{fontdir} || : \ -fi \ -\ -\ -%postun %{-n*} \ -if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then \ - %{_bindir}/fc-cache %{fontdir} || : \ -fi\ -\ -\ -%files %{-n*} \ -%defattr(0644,root,root,0755) \ -\ -%{-f:%config(noreplace) %{fontconfdir}%{-f*}} \ -\ -%(echo %* | sed "s+ +\\n+g"| sed "s+^+%{fontdir}+g") - Name: %{fontname}-fonts -Version: 2.26 -Release: 6%{?alphatag}%{?dist} +Version: 2.27 +Release: 7%{?alphatag}%{?dist} Summary: DejaVu fonts -Group: User Interface/X -License: Bitstream Vera and Public Domain -URL: http://%{fontname}.sf.net/ -Source0: %{?!alphatag:http://downloads.sourceforge.net/%{fontname}}%{?alphatag:%{fontname}.sourceforge.net/snapshots}/%{archivename}.tar.bz2 -Patch0: %{name}-2.26-fontconfig.patch - +Group: User Interface/X +License: Bitstream Vera and Public Domain +URL: http://%{fontname}.sf.net/ +Source0: %{?!alphatag:http://downloads.sourceforge.net/%{fontname}}%{?alphatag:%{fontname}.sourceforge.net/snapshots}/%{archivename}.tar.bz2 +Patch0: %{name}-2.26-fontconfig.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) + # Older fontforge versions will not work due to sfd format changes BuildRequires: fontforge >= 20080429 BuildRequires: perl(Font::TTF) # Needed to compute unicode coverage BuildRequires: %{Blocks} %{UnicodeData} -BuildArch: noarch + +BuildArch: noarch +BuildRequires: fontpackages-devel %description %common_desc -%package common -Summary: DejaVu fonts, common files (documentation…) -Group: User Interface/X - -Obsoletes: dejavu-fonts-doc < 2.26-6 - -%description common -%common_desc - -This package consists of files used by other DejaVu packages. - - %package compat Summary: DejaVu fonts, compatibility Group: User Interface/X @@ -111,18 +76,34 @@ Requires: %{name}-lgc-sans, %{name}-lgc-serif, %{name}-lgc-sans-mono %compat_desc +%package common +Summary: DejaVu fonts, common files (documentation…) +Group: User Interface/X +Requires: fontpackages-filesystem + +Obsoletes: dejavu-fonts-doc < 2.26-6 + +%description common +%common_desc + +This package consists of files used by other DejaVu packages. + + %package sans Summary: DejaVu, variable-width sans-serif font faces Group: User Interface/X Requires: %{name}-common = %{version}-%{release} +Conflicts: dejavu-fonts < 2.26-3 +Conflicts: dejavu-fonts-experimental < 2.26-3 + %description sans %common_desc This package consists of the DejaVu sans-serif variable-width font faces, in their unabridged version. -%font_subpkg -n sans -f *-%{fontname}-sans.conf DejaVuSans.ttf DejaVuSans-*.ttf DejaVuSansCondensed*.ttf +%_font_pkg -n sans -f *-%{fontname}-sans.conf DejaVuSans.ttf DejaVuSans-*.ttf DejaVuSansCondensed*.ttf %package serif @@ -130,13 +111,16 @@ Summary: DejaVu, variable-width serif font faces Group: User Interface/X Requires: %{name}-common = %{version}-%{release} +Conflicts: dejavu-fonts < 2.26-3 +Conflicts: dejavu-fonts-experimental < 2.26-3 + %description serif %common_desc This package consists of the DejaVu serif variable-width font faces, in their unabridged version. -%font_subpkg -n serif -f *-%{fontname}-serif.conf DejaVuSerif.ttf DejaVuSerif-*.ttf DejaVuSerifCondensed*.ttf +%_font_pkg -n serif -f *-%{fontname}-serif.conf DejaVuSerif.ttf DejaVuSerif-*.ttf DejaVuSerifCondensed*.ttf %package sans-mono @@ -144,13 +128,16 @@ Summary: DejaVu, monospace sans-serif font faces Group: User Interface/X Requires: %{name}-common = %{version}-%{release} +Conflicts: dejavu-fonts < 2.26-3 +Conflicts: dejavu-fonts-experimental < 2.26-3 + %description sans-mono %common_desc This package consists of the DejaVu sans-serif monospace font faces, in their unabridged version. -%font_subpkg -n sans-mono -f *-%{fontname}-sans-mono.conf DejaVuSansMono*.ttf +%_font_pkg -n sans-mono -f *-%{fontname}-sans-mono.conf DejaVuSansMono*.ttf %package lgc-sans @@ -158,13 +145,15 @@ Summary: DejaVu, variable-width sans-serif font faces, Latin-Greek-Cyrillic sub Group: User Interface/X Requires: %{name}-common = %{version}-%{release} +Conflicts: dejavu-lgc-fonts < 2.26-3 + %description lgc-sans %common_desc This package consists of the DejaVu sans-serif variable-width font faces, with unicode coverage restricted to Latin, Greek and Cyrillic. -%font_subpkg -n lgc-sans -f *-%{fontname}-lgc-sans.conf DejaVuLGCSans.ttf DejaVuLGCSans-*.ttf DejaVuLGCSansCondensed*.ttf +%_font_pkg -n lgc-sans -f *-%{fontname}-lgc-sans.conf DejaVuLGCSans.ttf DejaVuLGCSans-*.ttf DejaVuLGCSansCondensed*.ttf %package lgc-serif @@ -172,13 +161,15 @@ Summary: DejaVu, variable-width serif font faces, Latin-Greek-Cyrillic subset Group: User Interface/X Requires: %{name}-common = %{version}-%{release} +Conflicts: dejavu-lgc-fonts < 2.26-3 + %description lgc-serif %common_desc This package consists of the DejaVu serif variable-width font faces, with unicode coverage restricted to Latin, Greek and Cyrillic. -%font_subpkg -n lgc-serif -f *-%{fontname}-lgc-serif.conf DejaVuLGCSerif.ttf DejaVuLGCSerif-*.ttf DejaVuLGCSerifCondensed*.ttf +%_font_pkg -n lgc-serif -f *-%{fontname}-lgc-serif.conf DejaVuLGCSerif.ttf DejaVuLGCSerif-*.ttf DejaVuLGCSerifCondensed*.ttf %package lgc-sans-mono @@ -186,13 +177,15 @@ Summary: DejaVu, monospace sans-serif font faces, Latin-Greek-Cyrillic subset Group: User Interface/X Requires: %{name}-common = %{version}-%{release} +Conflicts: dejavu-lgc-fonts < 2.26-3 + %description lgc-sans-mono %common_desc This package consists of the DejaVu sans-serif monospace font faces, with unicode coverage restricted to Latin, Greek and Cyrillic. -%font_subpkg -n lgc-sans-mono -f *-%{fontname}-lgc-sans-mono.conf DejaVuLGCSansMono*.ttf +%_font_pkg -n lgc-sans-mono -f *-%{fontname}-lgc-sans-mono.conf DejaVuLGCSansMono*.ttf %prep @@ -215,29 +208,53 @@ make check %install rm -fr %{buildroot} -install -m 0755 -d %{buildroot}%{fontdir} -install -m 0644 -p build/*.ttf %{buildroot}%{fontdir} +install -m 0755 -d %{buildroot}%{_fontdir} +install -m 0644 -p build/*.ttf %{buildroot}%{_fontdir} -install -m 0755 -d %{buildroot}%{fontconfdir} -install -m 0644 -p fontconfig/*conf %{buildroot}%{fontconfdir} +install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \ + %{buildroot}%{_fontconfig_confdir} + +cd fontconfig +for fontconf in *conf ; do + install -m 0644 -p $fontconf %{buildroot}%{_fontconfig_templatedir} + ln -s %{_fontconfig_templatedir}/$fontconf \ + %{buildroot}%{_fontconfig_confdir}/$fontconf +done %clean rm -fr %{buildroot} -%files common -%defattr(0644,root,root,0755) -%doc AUTHORS BUGS LICENSE NEWS README -%doc build/unicover.txt build/status.txt.bz2 - -%dir %{fontdir}/ - %files compat %files lgc-compat +%files common +%defattr(0644,root,root,0755) +%doc AUTHORS BUGS LICENSE NEWS README +%doc build/unicover.txt build/status.txt.bz2 + +%dir %{_fontdir} + + %changelog +* Sat Dec 6 2008 +- 2.27-7 +߹ Add explicit conflicts to help yum + +* Sun Nov 23 2008 +- 2.27-5 +ᛤ ‘rpm-fonts’ renamed to “fontpackages” + +* Tue Nov 12 2008 +- 2.27-4 +▤ Tweak using new « rpm-fonts » + +* Mon Nov 10 2008 +- 2.26-7 +▤ Rebuild using new « rpm-fonts » + * Sun Nov 9 2008 Nicolas Mailhot - 2.26-6 ⧎ Package split reorganisation, following font family lines diff --git a/import.log b/import.log index abce153..b2de576 100644 --- a/import.log +++ b/import.log @@ -5,3 +5,4 @@ dejavu-fonts-2_26-3_fc11:HEAD:dejavu-fonts-2.26-3.fc11.src.rpm:1226169315 dejavu-fonts-2_26-4_fc11:HEAD:dejavu-fonts-2.26-4.fc11.src.rpm:1226172743 dejavu-fonts-2_26-5_fc11:HEAD:dejavu-fonts-2.26-5.fc11.src.rpm:1226174018 dejavu-fonts-2_26-6_fc11:HEAD:dejavu-fonts-2.26-6.fc11.src.rpm:1226221359 +dejavu-fonts-2_27-7_fc11:HEAD:dejavu-fonts-2.27-7.fc11.src.rpm:1229544635 diff --git a/sources b/sources index 1a73545..2ad7d63 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -26bae23fdfaba1020a88bcbf147ccd79 dejavu-fonts-2.26.tar.bz2 +bcab42220bcc27e094227ad6677d184d dejavu-fonts-2.27.tar.bz2