From 6af5b8d2b029a5c30ac2dc84e3f51555d83ac30d Mon Sep 17 00:00:00 2001 From: nim Date: Fri, 15 Sep 2006 19:00:26 +0000 Subject: [PATCH] auto-import dejavu-fonts-2.10.0-0.2.20060913svn1149.fc6 on branch devel from dejavu-fonts-2.10.0-0.2.20060913svn1149.fc6.src.rpm change conf number --- dejavu-fonts.spec | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dejavu-fonts.spec b/dejavu-fonts.spec index 71454c6..595c15b 100644 --- a/dejavu-fonts.spec +++ b/dejavu-fonts.spec @@ -1,7 +1,6 @@ %define archivename dejavu-sfd # This macro has the same value as %{version}, except when testing pre-release snapshots %define alphatag 20060913svn1149 -#%define alphatag rc1 %define archiveversion 20060913-1149 %define fontdir %{_datadir}/fonts/%{name} @@ -13,7 +12,7 @@ Name: dejavu-fonts Version: 2.10.0 -Release: 0.1.%{alphatag}%{?dist} +Release: 0.2.%{alphatag}%{?dist} Summary: DejaVu fonts Group: User Interface/X License: Redistributable, with restrictions @@ -93,8 +92,8 @@ 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/60-dejavu.conf -install -m 0644 %{SOURCE2} %{buildroot}%{fontconfdir}/conf.d/60-dejavu-experimental.conf +install -m 0644 %{SOURCE1} %{buildroot}%{fontconfdir}/conf.d/58-dejavu.conf +install -m 0644 %{SOURCE2} %{buildroot}%{fontconfdir}/conf.d/58-dejavu-experimental.conf %clean @@ -133,7 +132,7 @@ fi %defattr(0644,root,root,0755) %doc *.txt AUTHORS BUGS LICENSE NEWS README -%config %{fontconfdir}/conf.d/60-dejavu.conf +%config %{fontconfdir}/conf.d/58-dejavu.conf %dir %{fontdir} %{fontdir}/DejaVu*.ttf @@ -145,7 +144,7 @@ fi %files experimental %defattr(0644,root,root,0755) -%config %{fontconfdir}/conf.d/60-dejavu-experimental.conf +%config %{fontconfdir}/conf.d/58-dejavu-experimental.conf %{fontdir}/DejaVu*Condensed*.ttf %{fontdir}/DejaVu*ExtraLight*.ttf @@ -154,7 +153,7 @@ fi %changelog * Fri Sep 15 2006 Nicolas Mailhot -- 2.10.0-0.1.20060913-1149 +- 2.10.0-0.2.20060913-1149 - match dejavu-lgc core conf style once again * Wed Aug 30 2006 Nicolas Mailhot