From 49faee93a91e1bdc51db3c4266c193a508f8b7ef Mon Sep 17 00:00:00 2001 From: nim Date: Fri, 11 May 2007 13:11:07 +0000 Subject: [PATCH] 2.17-rc1 --- .cvsignore | 2 +- dejavu-fonts.spec | 22 ++++++++++++++-------- sources | 2 +- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/.cvsignore b/.cvsignore index 79e4cc3..7075f01 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -dejavu-sfd-2.16.tar.bz2 +dejavu-sfd-20070509-1766.tar.bz2 diff --git a/dejavu-fonts.spec b/dejavu-fonts.spec index bb63fcb..83cb828 100644 --- a/dejavu-fonts.spec +++ b/dejavu-fonts.spec @@ -1,9 +1,10 @@ %define archivename dejavu-sfd -#define alphatag .20070319svn1699 +#define alphatag .20070509svn1766 +%define alphatag .rc1 # This macro has the same value as %{version}, except when testing pre-release snapshots -#define archiveversion 20070319-1699 -%define archiveversion %{version} +%define archiveversion 20070509-1766 +#define archiveversion %{version} %define fontdir %{_datadir}/fonts/%{name} %define fontconfdir %{_sysconfdir}/fonts @@ -13,13 +14,13 @@ %define UnicodeData %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/UnicodeData.txt Name: dejavu-fonts -Version: 2.16 -Release: 1%{?dist} +Version: 2.17 +Release: 0.1%{?alphatag}%{?dist} Summary: DejaVu fonts Group: User Interface/X License: Redistributable, with restrictions URL: http://dejavu.sf.net/ -Source0: http://dejavu.sourceforge.net/snapshots/%{archivename}-%{archiveversion}.tar.bz2 +Source0: http://dejavu.sourceforge.net/%{?alphatag:snapshots/}%{archivename}-%{archiveversion}.tar.bz2 # DejaVu fontconfig setup Source1: %{name}-fontconfig.conf # DejaVu fontconfig setup (experimental families) @@ -104,7 +105,7 @@ install -m 0644 generated/*.ttf %{buildroot}%{fontdir} # Fontconfig overrides for some scripts install -d -m 0755 %{buildroot}%{fontconfdir}/conf.d -install -m 0644 %{SOURCE1} %{buildroot}%{fontconfdir}/conf.d/58-dejavu.conf +install -m 0644 %{SOURCE1} %{buildroot}%{fontconfdir}/conf.d/57-dejavu.conf install -m 0644 %{SOURCE2} %{buildroot}%{fontconfdir}/conf.d/61-dejavu-experimental.conf %clean @@ -143,7 +144,7 @@ fi %defattr(0644,root,root,0755) %doc *.txt AUTHORS BUGS LICENSE NEWS README -%config %{fontconfdir}/conf.d/58-dejavu.conf +%config %{fontconfdir}/conf.d/57-dejavu.conf %dir %{fontdir} %{fontdir}/DejaVu*.ttf @@ -163,6 +164,11 @@ fi %changelog +* Fri May 11 2007 Nicolas Mailhot +- 2.17-0.1.rc1 +- 2.17 rc1 +- make room for liberations font conf file + * Mon Apr 2 2007 Nicolas Mailhot - 2.16-1 diff --git a/sources b/sources index 92843b1..1a9b525 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -23258ffa98ffa0e7deaf006f8ed554d7 dejavu-sfd-2.16.tar.bz2 +8ac5a2c51a817e1d3480df80a91b9737 dejavu-sfd-20070509-1766.tar.bz2