diff --git a/.cvsignore b/.cvsignore index c6284e7..441a1d4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -dejavu-sfd-2.7.tar.gz +dejavu-sfd-20060712-976.tar.gz diff --git a/dejavu-fonts-arabic-override.conf b/dejavu-fonts-arabic-override.conf index ea6ab54..15db7fa 100644 --- a/dejavu-fonts-arabic-override.conf +++ b/dejavu-fonts-arabic-override.conf @@ -8,6 +8,8 @@ This file is distributed under the terms of the GNU General Public License (GPL) version 2. Copies of the GPL can be obtained from: http://www.gnu.org/licenses/gpl.html + + $Id$ --> diff --git a/dejavu-fonts-experimental-fontconfig.conf b/dejavu-fonts-experimental-fontconfig.conf new file mode 100644 index 0000000..ecf90f2 --- /dev/null +++ b/dejavu-fonts-experimental-fontconfig.conf @@ -0,0 +1,79 @@ + + + + + + + DejaVu Sans Condensed + + sans-serif + + + + DejaVu Serif Condensed + + serif + + + + + Toga Sans + + Toga Sans + DejaVu Sans Condensed + + + + + Toga Serif + + Toga Serif + DejaVu Serif Condensed + + + + + + DejaVu Sans Condensed + + + 7.5 + + + false + + + + + DejaVu Serif Condensed + + + 7.5 + + + false + + + + + DejaVu Sans Mono Condensed + + + 7.5 + + + false + + + diff --git a/dejavu-fonts-fontconfig.conf b/dejavu-fonts-fontconfig.conf index 7511ba3..381cde2 100644 --- a/dejavu-fonts-fontconfig.conf +++ b/dejavu-fonts-fontconfig.conf @@ -1,41 +1,31 @@ - - - + DejaVu Sans - DejaVu Sans Condensed sans-serif - DejaVu Serif - DejaVu Serif Condensed serif - + DejaVu Sans Mono @@ -153,4 +143,38 @@ DejaVu Sans Mono + + + + DejaVu Sans + + + 7.5 + + + false + + + + + DejaVu Serif + + + 7.5 + + + false + + + + + DejaVu Sans Mono + + + 7.5 + + + false + + diff --git a/dejavu-fonts-persian-override.conf b/dejavu-fonts-persian-override.conf index 11a0258..4b8643a 100644 --- a/dejavu-fonts-persian-override.conf +++ b/dejavu-fonts-persian-override.conf @@ -8,6 +8,8 @@ This file is distributed under the terms of the GNU General Public License (GPL) version 2. Copies of the GPL can be obtained from: http://www.gnu.org/licenses/gpl.html + + $Id$ --> diff --git a/dejavu-fonts.spec b/dejavu-fonts.spec index def7547..fc6cf10 100644 --- a/dejavu-fonts.spec +++ b/dejavu-fonts.spec @@ -1,18 +1,20 @@ %define archivename dejavu-sfd # This macro has the same value as %{version}, except when testing pre-release snapshots -#%define alphatag 20060618svn945 -%define archiveversion 2.7 +#%define alphatag 20060618svn945 +%define alphatag rc1 + +%define archiveversion 20060712-976 %define fontdir %{_datadir}/fonts/%{name} %define fontconfdir %{_sysconfdir}/fonts %define xsldir %{_datadir}/xml/%{name} # Let the perl Maintainer worry about Unicode.org data files (updates, licensing) -%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 Name: dejavu-fonts -Version: 2.7.0 -Release: 1%{?dist} +Version: 2.8.0 +Release: 0.2.%{alphatag}%{?dist} Summary: DejaVu fonts Group: User Interface/X License: Redistributable, with restrictions @@ -25,10 +27,12 @@ Source2: %{name}-block.xsl Source3: %{name}-unblock.xsl # DejaVu fontconfig setup Source4: %{name}-fontconfig.conf +# DejaVu fontconfig setup (experimental families) +Source5: %{name}-experimental-fontconfig.conf # Substitute the glyphs of another font in DejaVu for Farsi -Source5: %{name}-persian-override.conf +Source6: %{name}-persian-override.conf # Substitute the glyphs of another font in DejaVu for Arabic -Source6: %{name}-arabic-override.conf +Source7: %{name}-arabic-override.conf BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: fontforge # The CPAN sources do not declare perl(Font::TTF) @@ -139,9 +143,10 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{xsldir}/unblock.xsl # Fontconfig overrides for some scripts install -d -m 0755 %{buildroot}%{fontconfdir}/conf.d -install -m 0644 %{SOURCE4} %{buildroot}%{fontconfdir}/conf.d/20-DejaVu.conf -install -m 0644 %{SOURCE5} %{buildroot}%{fontconfdir}/conf.d/00-dejavu-persian-override.conf -install -m 0644 %{SOURCE6} %{buildroot}%{fontconfdir}/conf.d/00-dejavu-arabic-override.conf +install -m 0644 %{SOURCE4} %{buildroot}%{fontconfdir}/conf.d/20-dejavu.conf +install -m 0644 %{SOURCE5} %{buildroot}%{fontconfdir}/conf.d/20-dejavu-experimental.conf +install -m 0644 %{SOURCE6} %{buildroot}%{fontconfdir}/conf.d/00-dejavu-persian-override.conf +install -m 0644 %{SOURCE7} %{buildroot}%{fontconfdir}/conf.d/00-dejavu-arabic-override.conf %clean @@ -212,7 +217,7 @@ fi %defattr(0644,root,root,0755) %doc *.txt AUTHORS BUGS LICENSE NEWS README -%{fontconfdir}/conf.d/20-DejaVu.conf +%config %{fontconfdir}/conf.d/20-dejavu.conf %dir %{fontdir} %{fontdir}/DejaVu*.ttf @@ -223,6 +228,9 @@ fi %files experimental %defattr(0644,root,root,0755) + +%config %{fontconfdir}/conf.d/20-dejavu-experimental.conf + %{fontdir}/DejaVu*Condensed*.ttf %{fontdir}/DejaVu*ExtraLight*.ttf %{fontdir}/DejaVuSerif-*Oblique.ttf @@ -241,127 +249,85 @@ fi %{xsldir}/block.xsl %{xsldir}/unblock.xsl -%exclude %{fontconfdir}/conf.d/20-DejaVu.conf -%{fontconfdir}/conf.d/*.conf +%config %{fontconfdir}/conf.d/00-dejavu-*-override.conf %changelog -* Sun Jun 18 2006 Nicolas Mailhot - 2.7.0-1 +* Wed Jul 12 2006 Nicolas Mailhot +- 2.8.0-0.2.rc1 +- it's that time of the month again - 2.8.0 rc1 is out +- trim changelog a bit +- copy Vera GASP trick +- add Toga aliases + +* Sun Jun 18 2006 Nicolas Mailhot +- 2.7.0-1 - 2.7.0 final -* Sun Jun 18 2006 Nicolas Mailhot - 2.7.0-0.19 +* Sun Jun 18 2006 Nicolas Mailhot +- 2.7.0-0.19 - clean up descriptions -* Sun Jun 18 2006 Nicolas Mailhot - 2.7.0-0.18 +* Sun Jun 18 2006 Nicolas Mailhot +- 2.7.0-0.18 - update to 20060618-945 snapshot - tighten up obsoletes -* Fri Jun 16 2006 Nicolas Mailhot - 2.7.0-0.17 +* Fri Jun 16 2006 Nicolas Mailhot +- 2.7.0-0.17 - all behold the power of the alphatag -* Wed Jun 14 2006 Nicolas Mailhot - 2.7.0-0.15 +* Wed Jun 14 2006 Nicolas Mailhot +- 2.7.0-0.15 - update to 20060614-943 snapshot - do make dejavu the default in all cases when makedefault is installed - alias Vera derivatives merged in DejaVu - declare generics for all DejaVu faces -- remove more stuff moved to %{fontconfdir}/conf.d from the xslts +- remove more stuff moved to %%{fontconfdir}/conf.d from the xslts -* Sun Jun 11 2006 Nicolas Mailhot - 2.7.0-0.14 +* Sun Jun 11 2006 Nicolas Mailhot +- 2.7.0-0.14 - remove old blocking code before adding new one -* Sun Jun 11 2006 Nicolas Mailhot - 2.7.0-0.12 +* Sun Jun 11 2006 Nicolas Mailhot +- 2.7.0-0.12 - replace triggerun by preun -* Sun Jun 11 2006 Nicolas Mailhot - 2.7.0-0.10 +* Sun Jun 11 2006 Nicolas Mailhot +- 2.7.0-0.10 - block Sans instead of sans-serif - GNOME uses the first one -* Sun Jun 11 2006 Nicolas Mailhot - 2.7.0-0.9 +* Sun Jun 11 2006 Nicolas Mailhot +- 2.7.0-0.9 - reintroduce xslt triggers in dejavu-fonts-block as fontconfig conf.d priority is not high enough for our needs -* Sun Jun 11 2006 Nicolas Mailhot - 2.7.0-0.8 +* Sun Jun 11 2006 Nicolas Mailhot +- 2.7.0-0.8 - complete and clean up the Vera aliasing -* Sun Jun 11 2006 Nicolas Mailhot - 2.7.0-0.7 +* Sun Jun 11 2006 Nicolas Mailhot +- 2.7.0-0.7 - addition of fontconfig blocking for Arabic and Persian (experimental but safe) - tweak of the fontconfig aliasing to make DejaVu fonts the highest prio instead of following Vera ranking, and rename the subpackage accordingly -* Sun Jun 11 2006 Nicolas Mailhot - 2.7.0-0.1 +* Sun Jun 11 2006 Nicolas Mailhot +- 2.7.0-0.1 - preparation to 2.7.0 based on the current dejavu snapshot -* Mon May 15 2006 Nicolas Mailhot - 2.6.0-1 -- 2.6.0 +* Mon May 15 2006 Nicolas Mailhot +- 2.6.0-1 -* Sun Apr 23 2006 Nicolas Mailhot - 2.5.0-1 -- 2.5.0 +* Sun Apr 23 2006 Nicolas Mailhot +- 2.5.0-1 -* Wed Mar 29 2006 Nicolas Mailhot - 2.4.1-1 -- 2.4.1 (workaround pango problems) +* Wed Mar 29 2006 Nicolas Mailhot +- 2.4.1-1 +- (workaround pango problems) -* Wed Mar 22 2006 Nicolas Mailhot - 2.4-1 -- 2.4 A big thanks to Stepan Roh for getting the project there +* Wed Mar 22 2006 Nicolas Mailhot +- 2.4-1 +- 2.4 A big thanks to Štěpán Roh for getting the project there - split out experimental typefaces - -* Sat Mar 04 2006 Nicolas Mailhot - 2.3-3 -- split fontconfig registration in subpackage - -* Sat Mar 04 2006 Nicolas Mailhot - 2.3-2 -- register dejavu in fontconfig aliases - -* Mon Feb 20 2006 Nicolas Mailhot - 2.3-1 -- 2.3 - -* Mon Feb 13 2006 Nicolas Mailhot - 2.2-6 -- rebuilt for new gcc4.1 snapshot and glibc changes - -* Sun Feb 12 2006 Nicolas Mailhot 2.2-5 -- downgrade fontforge requirement following bug #181052 resolution - -* Sun Feb 12 2006 Nicolas Mailhot 2.2-4 -- WARNING: in an effort to get Fedora Extras as self-hosting as possible - starting from this release ttf files are regenerated from sfd sources - -* Mon Jan 16 2006 Nicolas Mailhot 2.2-2 -- bump release to ensure graceful FC4 -> FC5 update -- bump again because of bas CVS tag - -* Mon Jan 16 2006 Nicolas Mailhot 2.2-1 -- 2.2 - -* Wed Dec 28 2005 Nicolas Mailhot 2.1-1 -- 2.1 - -* Sun Nov 13 2005 Nicolas Mailhot 2.0-1 -- 2.0! - -* Fri Oct 28 2005 Nicolas Mailhot 1.15-2 -- add ghosting of %{fontdir}/fonts.cache-2 since it seems - needed nowadays - -* Sun Oct 16 2005 Nicolas Mailhot 1.15-1 -- 1.15 - -* Sat Oct 8 2005 Nicolas Mailhot 1.14-1 -- 1.14 -- still using prepackaged TTFs as the FE fontforge package is too old - -* Sun Jul 31 2005 Nicolas Mailhot 1.12-1 -- 1.12 - -* Thu Jun 23 2005 Nicolas Mailhot 1.11-1 -- 1.11 - -* Mon May 22 2005 Nicolas Mailhot 1.10-1 -- 1.10 - -* Sat May 21 2005 Nicolas Mailhot 1.9-2 -- 1.9 -- submission to FCE - -* Sat Feb 19 2005 Nicolas Mailhot 1.7-1 -- initial build - using vera as template - -* Sat Jan 08 2005 Florian La Roche -- rebuilt to get rid of legacy selinux filecontexts diff --git a/sources b/sources index 97f72a7..e7cbf00 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7fd8a8ebb835dfe3e74662219f3c5938 dejavu-sfd-2.7.tar.gz +7f36661c5098e6fc50c64ca43f5dad4a dejavu-sfd-20060712-976.tar.gz