update for new fonts guidelines
This commit is contained in:
parent
29c310af19
commit
58fc706a0f
@ -1 +1 @@
|
|||||||
dejavu-fonts-2.26.tar.bz2
|
dejavu-fonts-2.27.tar.bz2
|
||||||
|
@ -1,7 +1,4 @@
|
|||||||
%define fontname dejavu
|
%define fontname dejavu
|
||||||
%define fontdir %{_datadir}/fonts/%{fontname}/
|
|
||||||
%define fontconfdir %{_sysconfdir}/fonts/conf.d/
|
|
||||||
|
|
||||||
%define archivename %{name}-%{archiveversion}
|
%define archivename %{name}-%{archiveversion}
|
||||||
|
|
||||||
#define alphatag .20080512svn2226
|
#define alphatag .20080512svn2226
|
||||||
@ -11,8 +8,8 @@
|
|||||||
%define archiveversion %{version}
|
%define archiveversion %{version}
|
||||||
|
|
||||||
# Let the perl maintainer worry about Unicode.org data files
|
# Let the perl maintainer worry about Unicode.org data files
|
||||||
%define Blocks %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/Blocks.txt
|
%define Blocks %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/Blocks.txt
|
||||||
%define UnicodeData %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/UnicodeData.txt
|
%define UnicodeData %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/UnicodeData.txt
|
||||||
|
|
||||||
# Common description
|
# Common description
|
||||||
%define common_desc \
|
%define common_desc \
|
||||||
@ -29,63 +26,31 @@ 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
|
Name: %{fontname}-fonts
|
||||||
Version: 2.26
|
Version: 2.27
|
||||||
Release: 6%{?alphatag}%{?dist}
|
Release: 7%{?alphatag}%{?dist}
|
||||||
Summary: DejaVu fonts
|
Summary: DejaVu fonts
|
||||||
|
|
||||||
Group: User Interface/X
|
Group: User Interface/X
|
||||||
License: Bitstream Vera and Public Domain
|
License: Bitstream Vera and Public Domain
|
||||||
URL: http://%{fontname}.sf.net/
|
URL: http://%{fontname}.sf.net/
|
||||||
Source0: %{?!alphatag:http://downloads.sourceforge.net/%{fontname}}%{?alphatag:%{fontname}.sourceforge.net/snapshots}/%{archivename}.tar.bz2
|
Source0: %{?!alphatag:http://downloads.sourceforge.net/%{fontname}}%{?alphatag:%{fontname}.sourceforge.net/snapshots}/%{archivename}.tar.bz2
|
||||||
Patch0: %{name}-2.26-fontconfig.patch
|
Patch0: %{name}-2.26-fontconfig.patch
|
||||||
|
|
||||||
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
|
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
|
||||||
|
|
||||||
# Older fontforge versions will not work due to sfd format changes
|
# Older fontforge versions will not work due to sfd format changes
|
||||||
BuildRequires: fontforge >= 20080429
|
BuildRequires: fontforge >= 20080429
|
||||||
BuildRequires: perl(Font::TTF)
|
BuildRequires: perl(Font::TTF)
|
||||||
# Needed to compute unicode coverage
|
# Needed to compute unicode coverage
|
||||||
BuildRequires: %{Blocks} %{UnicodeData}
|
BuildRequires: %{Blocks} %{UnicodeData}
|
||||||
BuildArch: noarch
|
|
||||||
|
BuildArch: noarch
|
||||||
|
BuildRequires: fontpackages-devel
|
||||||
|
|
||||||
%description
|
%description
|
||||||
%common_desc
|
%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
|
%package compat
|
||||||
Summary: DejaVu fonts, compatibility
|
Summary: DejaVu fonts, compatibility
|
||||||
Group: User Interface/X
|
Group: User Interface/X
|
||||||
@ -111,18 +76,34 @@ Requires: %{name}-lgc-sans, %{name}-lgc-serif, %{name}-lgc-sans-mono
|
|||||||
%compat_desc
|
%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
|
%package sans
|
||||||
Summary: DejaVu, variable-width sans-serif font faces
|
Summary: DejaVu, variable-width sans-serif font faces
|
||||||
Group: User Interface/X
|
Group: User Interface/X
|
||||||
Requires: %{name}-common = %{version}-%{release}
|
Requires: %{name}-common = %{version}-%{release}
|
||||||
|
|
||||||
|
Conflicts: dejavu-fonts < 2.26-3
|
||||||
|
Conflicts: dejavu-fonts-experimental < 2.26-3
|
||||||
|
|
||||||
%description sans
|
%description sans
|
||||||
%common_desc
|
%common_desc
|
||||||
|
|
||||||
This package consists of the DejaVu sans-serif variable-width font faces, in
|
This package consists of the DejaVu sans-serif variable-width font faces, in
|
||||||
their unabridged version.
|
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
|
%package serif
|
||||||
@ -130,13 +111,16 @@ Summary: DejaVu, variable-width serif font faces
|
|||||||
Group: User Interface/X
|
Group: User Interface/X
|
||||||
Requires: %{name}-common = %{version}-%{release}
|
Requires: %{name}-common = %{version}-%{release}
|
||||||
|
|
||||||
|
Conflicts: dejavu-fonts < 2.26-3
|
||||||
|
Conflicts: dejavu-fonts-experimental < 2.26-3
|
||||||
|
|
||||||
%description serif
|
%description serif
|
||||||
%common_desc
|
%common_desc
|
||||||
|
|
||||||
This package consists of the DejaVu serif variable-width font faces, in their
|
This package consists of the DejaVu serif variable-width font faces, in their
|
||||||
unabridged version.
|
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
|
%package sans-mono
|
||||||
@ -144,13 +128,16 @@ Summary: DejaVu, monospace sans-serif font faces
|
|||||||
Group: User Interface/X
|
Group: User Interface/X
|
||||||
Requires: %{name}-common = %{version}-%{release}
|
Requires: %{name}-common = %{version}-%{release}
|
||||||
|
|
||||||
|
Conflicts: dejavu-fonts < 2.26-3
|
||||||
|
Conflicts: dejavu-fonts-experimental < 2.26-3
|
||||||
|
|
||||||
%description sans-mono
|
%description sans-mono
|
||||||
%common_desc
|
%common_desc
|
||||||
|
|
||||||
This package consists of the DejaVu sans-serif monospace font faces, in their
|
This package consists of the DejaVu sans-serif monospace font faces, in their
|
||||||
unabridged version.
|
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
|
%package lgc-sans
|
||||||
@ -158,13 +145,15 @@ Summary: DejaVu, variable-width sans-serif font faces, Latin-Greek-Cyrillic sub
|
|||||||
Group: User Interface/X
|
Group: User Interface/X
|
||||||
Requires: %{name}-common = %{version}-%{release}
|
Requires: %{name}-common = %{version}-%{release}
|
||||||
|
|
||||||
|
Conflicts: dejavu-lgc-fonts < 2.26-3
|
||||||
|
|
||||||
%description lgc-sans
|
%description lgc-sans
|
||||||
%common_desc
|
%common_desc
|
||||||
|
|
||||||
This package consists of the DejaVu sans-serif variable-width font faces, with
|
This package consists of the DejaVu sans-serif variable-width font faces, with
|
||||||
unicode coverage restricted to Latin, Greek and Cyrillic.
|
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
|
%package lgc-serif
|
||||||
@ -172,13 +161,15 @@ Summary: DejaVu, variable-width serif font faces, Latin-Greek-Cyrillic subset
|
|||||||
Group: User Interface/X
|
Group: User Interface/X
|
||||||
Requires: %{name}-common = %{version}-%{release}
|
Requires: %{name}-common = %{version}-%{release}
|
||||||
|
|
||||||
|
Conflicts: dejavu-lgc-fonts < 2.26-3
|
||||||
|
|
||||||
%description lgc-serif
|
%description lgc-serif
|
||||||
%common_desc
|
%common_desc
|
||||||
|
|
||||||
This package consists of the DejaVu serif variable-width font faces, with
|
This package consists of the DejaVu serif variable-width font faces, with
|
||||||
unicode coverage restricted to Latin, Greek and Cyrillic.
|
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
|
%package lgc-sans-mono
|
||||||
@ -186,13 +177,15 @@ Summary: DejaVu, monospace sans-serif font faces, Latin-Greek-Cyrillic subset
|
|||||||
Group: User Interface/X
|
Group: User Interface/X
|
||||||
Requires: %{name}-common = %{version}-%{release}
|
Requires: %{name}-common = %{version}-%{release}
|
||||||
|
|
||||||
|
Conflicts: dejavu-lgc-fonts < 2.26-3
|
||||||
|
|
||||||
%description lgc-sans-mono
|
%description lgc-sans-mono
|
||||||
%common_desc
|
%common_desc
|
||||||
|
|
||||||
This package consists of the DejaVu sans-serif monospace font faces, with
|
This package consists of the DejaVu sans-serif monospace font faces, with
|
||||||
unicode coverage restricted to Latin, Greek and Cyrillic.
|
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
|
%prep
|
||||||
@ -215,29 +208,53 @@ make check
|
|||||||
%install
|
%install
|
||||||
rm -fr %{buildroot}
|
rm -fr %{buildroot}
|
||||||
|
|
||||||
install -m 0755 -d %{buildroot}%{fontdir}
|
install -m 0755 -d %{buildroot}%{_fontdir}
|
||||||
install -m 0644 -p build/*.ttf %{buildroot}%{fontdir}
|
install -m 0644 -p build/*.ttf %{buildroot}%{_fontdir}
|
||||||
|
|
||||||
install -m 0755 -d %{buildroot}%{fontconfdir}
|
install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
|
||||||
install -m 0644 -p fontconfig/*conf %{buildroot}%{fontconfdir}
|
%{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
|
%clean
|
||||||
rm -fr %{buildroot}
|
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 compat
|
||||||
%files lgc-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
|
%changelog
|
||||||
|
* Sat Dec 6 2008 <nicolas.mailhot at laposte.net>
|
||||||
|
- 2.27-7
|
||||||
|
߹ Add explicit conflicts to help yum
|
||||||
|
|
||||||
|
* Sun Nov 23 2008 <nicolas.mailhot at laposte.net>
|
||||||
|
- 2.27-5
|
||||||
|
ᛤ ‘rpm-fonts’ renamed to “fontpackages”
|
||||||
|
|
||||||
|
* Tue Nov 12 2008 <nicolas.mailhot at laposte.net>
|
||||||
|
- 2.27-4
|
||||||
|
▤ Tweak using new « rpm-fonts »
|
||||||
|
|
||||||
|
* Mon Nov 10 2008 <nicolas.mailhot at laposte.net>
|
||||||
|
- 2.26-7
|
||||||
|
▤ Rebuild using new « rpm-fonts »
|
||||||
|
|
||||||
* Sun Nov 9 2008 Nicolas Mailhot <nicolas.mailhot at laposte.net>
|
* Sun Nov 9 2008 Nicolas Mailhot <nicolas.mailhot at laposte.net>
|
||||||
- 2.26-6
|
- 2.26-6
|
||||||
⧎ Package split reorganisation, following font family lines
|
⧎ Package split reorganisation, following font family lines
|
||||||
|
@ -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-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-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_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
|
||||||
|
Loading…
Reference in New Issue
Block a user