From bcd73bd23ae50ca1c407572962916ec66fbe99ee Mon Sep 17 00:00:00 2001 From: nim Date: Sun, 17 Dec 2006 18:49:23 +0000 Subject: [PATCH] auto-import dejavu-fonts-2.13-1.fc7 on branch devel from dejavu-fonts-2.13-1.fc7.src.rpm 2.13 --- .cvsignore | 2 +- dejavu-fonts.spec | 21 ++++++++++++++++----- sources | 2 +- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/.cvsignore b/.cvsignore index 1c0fa86..ac9a406 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -dejavu-sfd-2.12.tar.bz2 +dejavu-sfd-2.13.tar.bz2 diff --git a/dejavu-fonts.spec b/dejavu-fonts.spec index 1ce3320..8958064 100644 --- a/dejavu-fonts.spec +++ b/dejavu-fonts.spec @@ -1,8 +1,8 @@ %define archivename dejavu-sfd # This macro has the same value as %{version}, except when testing pre-release snapshots -#%define alphatag .rc1 +#define alphatag .rc1 -#%define archiveversion 20061115-1287 +#define archiveversion 20061115-1287 %define archiveversion %{version} %define fontdir %{_datadir}/fonts/%{name} %define fontconfdir %{_sysconfdir}/fonts @@ -12,13 +12,13 @@ %define UnicodeData %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/UnicodeData.txt Name: dejavu-fonts -Version: 2.12 +Version: 2.13 Release: 1%{?alphatag}%{?dist} Summary: DejaVu fonts Group: User Interface/X License: Redistributable, with restrictions URL: http://dejavu.sf.net/ -Source0: http://prdownloads.sourceforge.net/dejavu/%{archivename}-%{archiveversion}.tar.bz2 +Source0: http://prdownloads.sourceforge.net/dejavu/%{archivename}-%{archiveversion}.tar.bz2 # DejaVu fontconfig setup Source1: %{name}-fontconfig.conf # DejaVu fontconfig setup (experimental families) @@ -32,6 +32,14 @@ BuildRequires: %{Blocks} %{UnicodeData} # If we add this the package will require fontconfig # Requires: %{fontconfdir}/conf.d BuildArch: noarch + +# We do not want font packages to depend on fontconfig +# However these packages do install configuration files in +# %{_sysconfdir}/fonts; also they rely on the current release fontconfig cache +# handling style, should it be available on the system. +# To prevent strange things should anyone try to install them on a system +# with an older fontconfig, we explicitely conflict with fontconfig versions +# found in older Fedora releases Conflicts: fontconfig < 2.4.0 Obsoletes: %{name}-fontconfig < 2.7.0-0.15 @@ -155,7 +163,10 @@ fi %changelog -* Tue Nov 21 2006 Nicolas Mailhot +* Sun Dec 17 2006 Nicolas Mailhot +- 2.13 + +* Tue Nov 21 2006 Nicolas Mailhot - 2.12 - only in devel for now diff --git a/sources b/sources index ac44647..4a0a9ba 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9dc019f130d23d54cf01f7936158a482 dejavu-sfd-2.12.tar.bz2 +1db3589969da9cb154d8cfefe703af88 dejavu-sfd-2.13.tar.bz2