diff --git a/dejavu-fonts-arabic-override.conf b/dejavu-fonts-arabic-override.conf deleted file mode 100644 index 15db7fa..0000000 --- a/dejavu-fonts-arabic-override.conf +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - DejaVu Sans - ar - - KacstQura - - - - DejaVu Serif - ar - - KacstQura - - - - DejaVu Sans Mono - ar - - KacstQuraFixed - - - diff --git a/dejavu-fonts-block.xsl b/dejavu-fonts-block.xsl deleted file mode 100644 index b7a3862..0000000 --- a/dejavu-fonts-block.xsl +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - Added by dejavu-fonts-block - Use KacstQura as default sans-serif when lang is Arabic - Sans - ar - - KacstQura - - - - Added by dejavu-fonts-block - Use KacstQura as default serif when lang is Arabic - Serif - ar - - KacstQura - - - - Added by dejavu-fonts-block - Use KacstQura as default monospace when lang is Arabic - Monospace - ar - - KacstQuraFixed - - - - Added by dejavu-fonts-block - Use Roya as default sans-serif when lang is Farsi - Sans - fa - - Roya - - - - Added by dejavu-fonts-block - Use Nazli as default serif when lang is Farsi - Serif - fa - - Nazli - - - - Added by dejavu-fonts-block - Use Terafik as default monospace when lang is Farsi - Monospace - fa - - Terafik - - - - - diff --git a/dejavu-fonts-experimental-fontconfig.conf b/dejavu-fonts-experimental-fontconfig.conf index ecf90f2..685aaf8 100644 --- a/dejavu-fonts-experimental-fontconfig.conf +++ b/dejavu-fonts-experimental-fontconfig.conf @@ -26,7 +26,14 @@ serif - + + + DejaVu LGC Sans Condensed + + DejaVu LGC Sans Condensed + DejaVu Sans Condensed + + Toga Sans @@ -34,7 +41,13 @@ DejaVu Sans Condensed - + + DejaVu LGC Serif Condensed + + DejaVu LGC Serif Condensed + DejaVu Serif Condensed + + Toga Serif diff --git a/dejavu-fonts-fontconfig.conf b/dejavu-fonts-fontconfig.conf index 381cde2..03584f2 100644 --- a/dejavu-fonts-fontconfig.conf +++ b/dejavu-fonts-fontconfig.conf @@ -41,6 +41,13 @@ DejaVu Sans + + DejaVu LGC Sans + + DejaVu LGC Sans + DejaVu Sans + + Arev Sans @@ -92,6 +99,13 @@ DejaVu Serif + + DejaVu LGC Serif + + DejaVu LGC Serif + DejaVu Serif + + SUSE Serif @@ -122,6 +136,13 @@ DejaVu Sans Mono + + DejaVu LGC Sans Mono + + DejaVu LGC Sans Mono + DejaVu Sans Mono + + SUSE Sans Mono diff --git a/dejavu-fonts-makedefault.xsl b/dejavu-fonts-makedefault.xsl deleted file mode 100644 index b457a1d..0000000 --- a/dejavu-fonts-makedefault.xsl +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - DejaVu Serif - - - - - - - - DejaVu Sans - - - - - - - - DejaVu Sans Mono - - - - - - diff --git a/dejavu-fonts-persian-override.conf b/dejavu-fonts-persian-override.conf deleted file mode 100644 index 4b8643a..0000000 --- a/dejavu-fonts-persian-override.conf +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - DejaVu Sans - fa - - Roya - - - - DejaVu Serif - fa - - Nazli - - - - DejaVu Sans Mono - fa - - Terafik - - - diff --git a/dejavu-fonts-unblock.xsl b/dejavu-fonts-unblock.xsl deleted file mode 100644 index c19bf37..0000000 --- a/dejavu-fonts-unblock.xsl +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/dejavu-fonts.spec b/dejavu-fonts.spec index b0bc4ab..42aeba4 100644 --- a/dejavu-fonts.spec +++ b/dejavu-fonts.spec @@ -6,7 +6,6 @@ %define archiveversion 2.8 %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 @@ -14,25 +13,16 @@ Name: dejavu-fonts Version: 2.8.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: DejaVu fonts Group: User Interface/X License: Redistributable, with restrictions URL: http://dejavu.sf.net/ -Source: http://prdownloads.sourceforge.net/dejavu/%{archivename}-%{archiveversion}.tar.gz -# Make DejaVu fonts the default in Sans, Serif and Monospace -Source1: %{name}-makedefault.xsl -# Substitute the glyphs of another font in Sans, Serif and Monospace for Arabic and Farsi -Source2: %{name}-block.xsl -Source3: %{name}-unblock.xsl +Source0: http://prdownloads.sourceforge.net/dejavu/%{archivename}-%{archiveversion}.tar.gz # DejaVu fontconfig setup -Source4: %{name}-fontconfig.conf +Source1: %{name}-fontconfig.conf # DejaVu fontconfig setup (experimental families) -Source5: %{name}-experimental-fontconfig.conf -# Substitute the glyphs of another font in DejaVu for Farsi -Source6: %{name}-persian-override.conf -# Substitute the glyphs of another font in DejaVu for Arabic -Source7: %{name}-arabic-override.conf +Source2: %{name}-experimental-fontconfig.conf BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: fontforge # The CPAN sources do not declare perl(Font::TTF) @@ -44,6 +34,10 @@ BuildRequires: %{Blocks} %{UnicodeData} BuildArch: noarch Conflicts: fontconfig < 2.3.93 +Obsoletes: %{name}-fontconfig < 2.7.0-0.15 +Obsoletes: %{name}-makedefault < 2.8.0-0.2 +Obsoletes: %{name}-block < 2.8.0-0.2 + %description The DejaVu fonts are a font family based on the Bitstream Vera Fonts release @@ -67,44 +61,6 @@ The DejaVu fonts are a font family based on the Bitstream Vera Fonts release This package includes the typefaces the DejaVu project considers experimental. -%package makedefault -Group: User Interface/X -Summary: Files needed to make DejaVu the default fontconfig fonts -# Needed for xslt processing of %{fontconfdir}/fonts.conf -Requires: %{_bindir}/xsltproc, /bin/mktemp, %{fontconfdir}/fonts.conf -Obsoletes: %{name}-fontconfig < 2.7.0-0.15 -Conflicts: %{name}-fontconfig < 2.7.0-0.15 - -%description makedefault -The DejaVu fonts are a font family based on the Bitstream Vera Fonts release -1.10. This package will add DejaVu fonts to fontconfig aliases and keep them -there. - -It will make DejaVu fonts the first choice in Sans, Sans-Serif and Monospace. - - -%package block -Group: User Interface/X -Summary: Files needed to block DejaVu use with some scripts -Requires: %{fontconfdir}/conf.d -# Needed for xslt processing of %{fontconfdir}/fonts.conf -Requires: %{_bindir}/xsltproc, /bin/mktemp, %{fontconfdir}/fonts.conf - -%description block -The DejaVu fonts are a font family based on the Bitstream Vera Fonts release -1.10. While their glyph coverage and quality is improving every release, they -may not yet be suitable for intensive use for some scripts. - -This package will force substitution of DejaVu by other fonts when rendering -one of these scripts. If you need to install it, you probably have -some enhancement suggestions to make at -https://bugs.freedesktop.org/enter_bug.cgi?product=DejaVu or -dejavu-fonts at lists.sourceforge.net - -Requests for enhancements or fixes of the blocking code should go to -https://bugzilla.redhat.com/bugzilla/enter_bug.cgi?product=Fedora%20Extras - - %prep %setup -q -n %{archivename}-%{archiveversion} @@ -135,18 +91,10 @@ mv status.txt.new status.txt install -d -m 0755 %{buildroot}%{fontdir} install -m 0644 generated/*.ttf %{buildroot}%{fontdir} -#xsl -install -d -m 755 %{buildroot}%{xsldir} -install -p -m 644 %{SOURCE1} %{buildroot}%{xsldir}/makedefault.xsl -install -p -m 644 %{SOURCE2} %{buildroot}%{xsldir}/block.xsl -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/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 +install -m 0644 %{SOURCE1} %{buildroot}%{fontconfdir}/conf.d/20-dejavu.conf +install -m 0644 %{SOURCE2} %{buildroot}%{fontconfdir}/conf.d/20-dejavu-experimental.conf %clean @@ -181,38 +129,6 @@ if [ "$1" = "0" ]; then fi -### Triggers yes I know I'm mad - -# I hope this won't be necessary by FC6 time -%triggerin makedefault -- fontconfig, %{fontconfdir}/fonts.conf -if [ -w %{fontconfdir}/fonts.conf ] ; then - TMPFILE=$(/bin/mktemp -q /tmp/fonts.conf.XXXXXX) && \ - %{_bindir}/xsltproc --novalid --output $TMPFILE \ - %{xsldir}/makedefault.xsl %{fontconfdir}/fonts.conf && \ - /bin/cat $TMPFILE > %{fontconfdir}/fonts.conf && /bin/rm $TMPFILE -fi - - -# These bits do not seem achieveable right now by dumping files in -# %{fontconfdir}/conf.d -%triggerin block -- fontconfig, %{fontconfdir}/fonts.conf -if [ -w %{fontconfdir}/fonts.conf ] ; then - TMPFILE=$(/bin/mktemp -q /tmp/fonts.conf.XXXXXX) && \ - %{_bindir}/xsltproc --novalid --output $TMPFILE \ - %{xsldir}/block.xsl %{fontconfdir}/fonts.conf && \ - /bin/cat $TMPFILE > %{fontconfdir}/fonts.conf && /bin/rm $TMPFILE -fi - - -%preun block -if [ "$1" = "0" -a -w %{fontconfdir}/fonts.conf ] ; then - TMPFILE=$(/bin/mktemp -q /tmp/fonts.conf.XXXXXX) && \ - %{_bindir}/xsltproc --novalid --output $TMPFILE \ - %{xsldir}/unblock.xsl %{fontconfdir}/fonts.conf && \ - /bin/cat $TMPFILE > %{fontconfdir}/fonts.conf && /bin/rm $TMPFILE -fi - - %files %defattr(0644,root,root,0755) %doc *.txt AUTHORS BUGS LICENSE NEWS README @@ -236,23 +152,14 @@ fi %{fontdir}/DejaVuSerif-*Oblique.ttf -%files makedefault -%defattr(0644,root,root,0755) -%dir %{xsldir} -%{xsldir}/makedefault.xsl - - -%files block -%defattr(0644,root,root,0755) - -%dir %{xsldir} -%{xsldir}/block.xsl -%{xsldir}/unblock.xsl - -%config %{fontconfdir}/conf.d/00-dejavu-*-override.conf - - %changelog +* Sun Jul 30 2006 Nicolas Mailhot +- 2.8.0-2 +- Massive simplification of the spec following dejavu-lgc inclusion in FC. The + removed parts were intended to workaround the fact no dejavu variant was in + core. Since there is one now, and dejavu full only complements the dejavu-lgc + package, the lgc maintainer should take care of the corresponding settings. + * Sun Jul 16 2006 Nicolas Mailhot - 2.8.0-1 - 2.8.0 final