Author: nim Update of /cvs/extras/rpms/dejavu-fonts/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17478/devel
Modified Files: dejavu-fonts.spec import.log Added Files: dejavu-fonts-2.26-fontconfig.patch Log Message: major package rework with new subpackage split dejavu-fonts-2.26-fontconfig.patch: --- NEW FILE dejavu-fonts-2.26-fontconfig.patch --- diff -uNr dejavu-fonts-2.26.orig/fontconfig/20-unhint-small-dejavu.conf dejavu-fonts-2.26/fontconfig/20-unhint-small-dejavu.conf --- dejavu-fonts-2.26.orig/fontconfig/20-unhint-small-dejavu.conf 2007-10-28 21:22:07.000000000 +0100 +++ dejavu-fonts-2.26/fontconfig/20-unhint-small-dejavu.conf 1970-01-01 01:00:00.000000000 +0100 @@ -1,48 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE fontconfig SYSTEM "../fonts.dtd"> -<fontconfig> - <!-- /etc/fonts/conf.d/20-unhint-small-dejavu.conf - - Disable hinting manually at smaller sizes (< 8ppem) - This is a copy of the Bistream Vera fonts fonts rule, as DejaVu is - derived from Vera. - - The Bistream Vera fonts have GASP entries suggesting that hinting be - disabled below 8 ppem, but FreeType ignores those, preferring to use - the data found in the instructed hints. The initial Vera release - didn't include the right instructions in the 'prep' table. - --> - <match target="font"> - <test name="family"> - <string>DejaVu Sans</string> - </test> - <test compare="less" name="pixelsize"> - <double>7.5</double> - </test> - <edit name="hinting"> - <bool>false</bool> - </edit> - </match> - <match target="font"> - <test name="family"> - <string>DejaVu Sans Mono</string> - </test> - <test compare="less" name="pixelsize"> - <double>7.5</double> - </test> - <edit name="hinting"> - <bool>false</bool> - </edit> - </match> - <match target="font"> - <test name="family"> - <string>DejaVu Serif</string> - </test> - <test compare="less" name="pixelsize"> - <double>7.5</double> - </test> - <edit name="hinting"> - <bool>false</bool> - </edit> - </match> -</fontconfig> diff -uNr dejavu-fonts-2.26.orig/fontconfig/20-unhint-small-dejavu-experimental.conf dejavu-fonts-2.26/fontconfig/20-unhint-small-dejavu-experimental.conf --- dejavu-fonts-2.26.orig/fontconfig/20-unhint-small-dejavu-experimental.conf 2007-10-28 21:22:07.000000000 +0100 +++ dejavu-fonts-2.26/fontconfig/20-unhint-small-dejavu-experimental.conf 1970-01-01 01:00:00.000000000 +0100 @@ -1,48 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE fontconfig SYSTEM "../fonts.dtd"> -<fontconfig> - <!-- /etc/fonts/conf.d/20-unhint-small-dejavu-experimental.conf - - Disable hinting manually at smaller sizes (< 8ppem) - This is a copy of the Bistream Vera fonts fonts rule, as DejaVu is - derived from Vera. - - The Bistream Vera fonts have GASP entries suggesting that hinting be - disabled below 8 ppem, but FreeType ignores those, preferring to use - the data found in the instructed hints. The initial Vera release - didn't include the right instructions in the 'prep' table. - --> - <match target="font"> - <test name="family"> - <string>DejaVu Sans Condensed</string> - </test> - <test compare="less" name="pixelsize"> - <double>7.5</double> - </test> - <edit name="hinting"> - <bool>false</bool> - </edit> - </match> - <match target="font"> - <test name="family"> - <string>DejaVu Sans Mono Condensed</string> - </test> - <test compare="less" name="pixelsize"> - <double>7.5</double> - </test> - <edit name="hinting"> - <bool>false</bool> - </edit> - </match> - <match target="font"> - <test name="family"> - <string>DejaVu Serif Condensed</string> - </test> - <test compare="less" name="pixelsize"> - <double>7.5</double> - </test> - <edit name="hinting"> - <bool>false</bool> - </edit> - </match> -</fontconfig> diff -uNr dejavu-fonts-2.26.orig/fontconfig/20-unhint-small-dejavu-lgc.conf dejavu-fonts-2.26/fontconfig/20-unhint-small-dejavu-lgc.conf --- dejavu-fonts-2.26.orig/fontconfig/20-unhint-small-dejavu-lgc.conf 2007-10-28 21:22:07.000000000 +0100 +++ dejavu-fonts-2.26/fontconfig/20-unhint-small-dejavu-lgc.conf 1970-01-01 01:00:00.000000000 +0100 @@ -1,70 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE fontconfig SYSTEM "../fonts.dtd"> -<fontconfig> - <!-- /etc/fonts/conf.d/20-unhint-small-dejavu-lgc.conf - - Disable hinting manually at smaller sizes (< 8ppem) - This is a copy of the Bistream Vera fonts fonts rule, as DejaVu is - derived from Vera. - - The Bistream Vera fonts have GASP entries suggesting that hinting be - disabled below 8 ppem, but FreeType ignores those, preferring to use - the data found in the instructed hints. The initial Vera release - didn't include the right instructions in the 'prep' table. - --> - <match target="font"> - <test name="family"> - <string>DejaVu LGC Sans</string> - </test> - <test compare="less" name="pixelsize"> - <double>7.5</double> - </test> - <edit name="hinting"> - <bool>false</bool> - </edit> - </match> - <match target="font"> - <test name="family"> - <string>DejaVu LGC Sans Condensed</string> - </test> - <test compare="less" name="pixelsize"> - <double>7.5</double> - </test> - <edit name="hinting"> - <bool>false</bool> - </edit> - </match> - <match target="font"> - <test name="family"> - <string>DejaVu LGC Sans Mono</string> - </test> - <test compare="less" name="pixelsize"> - <double>7.5</double> - </test> - <edit name="hinting"> - <bool>false</bool> - </edit> - </match> - <match target="font"> - <test name="family"> - <string>DejaVu LGC Serif</string> - </test> - <test compare="less" name="pixelsize"> - <double>7.5</double> - </test> - <edit name="hinting"> - <bool>false</bool> - </edit> - </match> - <match target="font"> - <test name="family"> - <string>DejaVu LGC Serif Condensed</string> - </test> - <test compare="less" name="pixelsize"> - <double>7.5</double> - </test> - <edit name="hinting"> - <bool>false</bool> - </edit> - </match> -</fontconfig> diff -uNr dejavu-fonts-2.26.orig/fontconfig/20-unhint-small-dejavu-lgc-sans.conf dejavu-fonts-2.26/fontconfig/20-unhint-small-dejavu-lgc-sans.conf --- dejavu-fonts-2.26.orig/fontconfig/20-unhint-small-dejavu-lgc-sans.conf 1970-01-01 01:00:00.000000000 +0100 +++ dejavu-fonts-2.26/fontconfig/20-unhint-small-dejavu-lgc-sans.conf 2008-11-08 12:30:47.000000000 +0100 @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE fontconfig SYSTEM "../fonts.dtd"> +<fontconfig> + <!-- /etc/fonts/conf.d/20-unhint-small-dejavu-lgc-sans.conf + + Disable hinting manually at smaller sizes (< 8ppem) + This is a copy of the Bistream Vera fonts fonts rule, as DejaVu is + derived from Vera. + + The Bistream Vera fonts have GASP entries suggesting that hinting be + disabled below 8 ppem, but FreeType ignores those, preferring to use + the data found in the instructed hints. The initial Vera release + didn't include the right instructions in the 'prep' table. + --> + <match target="font"> + <test name="family"> + <string>DejaVu LGC Sans</string> + </test> + <test compare="less" name="pixelsize"> + <double>7.5</double> + </test> + <edit name="hinting"> + <bool>false</bool> + </edit> + </match> +</fontconfig> diff -uNr dejavu-fonts-2.26.orig/fontconfig/20-unhint-small-dejavu-lgc-sans-mono.conf dejavu-fonts-2.26/fontconfig/20-unhint-small-dejavu-lgc-sans-mono.conf --- dejavu-fonts-2.26.orig/fontconfig/20-unhint-small-dejavu-lgc-sans-mono.conf 1970-01-01 01:00:00.000000000 +0100 +++ dejavu-fonts-2.26/fontconfig/20-unhint-small-dejavu-lgc-sans-mono.conf 2008-11-08 12:30:48.000000000 +0100 @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE fontconfig SYSTEM "../fonts.dtd"> +<fontconfig> + <!-- /etc/fonts/conf.d/20-unhint-small-dejavu-lgc-sans-mono.conf + + Disable hinting manually at smaller sizes (< 8ppem) + This is a copy of the Bistream Vera fonts fonts rule, as DejaVu is + derived from Vera. + + The Bistream Vera fonts have GASP entries suggesting that hinting be + disabled below 8 ppem, but FreeType ignores those, preferring to use + the data found in the instructed hints. The initial Vera release + didn't include the right instructions in the 'prep' table. + --> + <match target="font"> + <test name="family"> + <string>DejaVu LGC Sans Mono</string> + </test> + <test compare="less" name="pixelsize"> + <double>7.5</double> + </test> + <edit name="hinting"> + <bool>false</bool> + </edit> + </match> +</fontconfig> diff -uNr dejavu-fonts-2.26.orig/fontconfig/20-unhint-small-dejavu-lgc-serif.conf dejavu-fonts-2.26/fontconfig/20-unhint-small-dejavu-lgc-serif.conf --- dejavu-fonts-2.26.orig/fontconfig/20-unhint-small-dejavu-lgc-serif.conf 1970-01-01 01:00:00.000000000 +0100 +++ dejavu-fonts-2.26/fontconfig/20-unhint-small-dejavu-lgc-serif.conf 2008-11-08 12:30:48.000000000 +0100 @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE fontconfig SYSTEM "../fonts.dtd"> +<fontconfig> + <!-- /etc/fonts/conf.d/20-unhint-small-dejavu-lgc-serif.conf + + Disable hinting manually at smaller sizes (< 8ppem) + This is a copy of the Bistream Vera fonts fonts rule, as DejaVu is + derived from Vera. + + The Bistream Vera fonts have GASP entries suggesting that hinting be + disabled below 8 ppem, but FreeType ignores those, preferring to use + the data found in the instructed hints. The initial Vera release + didn't include the right instructions in the 'prep' table. + --> + <match target="font"> + <test name="family"> + <string>DejaVu LGC Serif</string> + </test> + <test compare="less" name="pixelsize"> + <double>7.5</double> + </test> + <edit name="hinting"> + <bool>false</bool> + </edit> + </match> +</fontconfig> diff -uNr dejavu-fonts-2.26.orig/fontconfig/20-unhint-small-dejavu-sans.conf dejavu-fonts-2.26/fontconfig/20-unhint-small-dejavu-sans.conf --- dejavu-fonts-2.26.orig/fontconfig/20-unhint-small-dejavu-sans.conf 1970-01-01 01:00:00.000000000 +0100 +++ dejavu-fonts-2.26/fontconfig/20-unhint-small-dejavu-sans.conf 2008-11-08 12:30:48.000000000 +0100 @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE fontconfig SYSTEM "../fonts.dtd"> +<fontconfig> + <!-- /etc/fonts/conf.d/20-unhint-small-dejavu-sans.conf + + Disable hinting manually at smaller sizes (< 8ppem) + This is a copy of the Bistream Vera fonts fonts rule, as DejaVu is + derived from Vera. + + The Bistream Vera fonts have GASP entries suggesting that hinting be + disabled below 8 ppem, but FreeType ignores those, preferring to use + the data found in the instructed hints. The initial Vera release + didn't include the right instructions in the 'prep' table. + --> + <match target="font"> + <test name="family"> + <string>DejaVu Sans</string> + </test> + <test compare="less" name="pixelsize"> + <double>7.5</double> + </test> + <edit name="hinting"> + <bool>false</bool> + </edit> + </match> +</fontconfig> diff -uNr dejavu-fonts-2.26.orig/fontconfig/20-unhint-small-dejavu-sans-mono.conf dejavu-fonts-2.26/fontconfig/20-unhint-small-dejavu-sans-mono.conf --- dejavu-fonts-2.26.orig/fontconfig/20-unhint-small-dejavu-sans-mono.conf 1970-01-01 01:00:00.000000000 +0100 +++ dejavu-fonts-2.26/fontconfig/20-unhint-small-dejavu-sans-mono.conf 2008-11-08 12:30:48.000000000 +0100 @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE fontconfig SYSTEM "../fonts.dtd"> +<fontconfig> + <!-- /etc/fonts/conf.d/20-unhint-small-dejavu-sans-mono.conf + + Disable hinting manually at smaller sizes (< 8ppem) + This is a copy of the Bistream Vera fonts fonts rule, as DejaVu is + derived from Vera. + + The Bistream Vera fonts have GASP entries suggesting that hinting be + disabled below 8 ppem, but FreeType ignores those, preferring to use + the data found in the instructed hints. The initial Vera release + didn't include the right instructions in the 'prep' table. + --> + <match target="font"> + <test name="family"> + <string>DejaVu Sans Mono</string> + </test> + <test compare="less" name="pixelsize"> + <double>7.5</double> + </test> + <edit name="hinting"> + <bool>false</bool> + </edit> + </match> +</fontconfig> diff -uNr dejavu-fonts-2.26.orig/fontconfig/20-unhint-small-dejavu-serif.conf dejavu-fonts-2.26/fontconfig/20-unhint-small-dejavu-serif.conf --- dejavu-fonts-2.26.orig/fontconfig/20-unhint-small-dejavu-serif.conf 1970-01-01 01:00:00.000000000 +0100 +++ dejavu-fonts-2.26/fontconfig/20-unhint-small-dejavu-serif.conf 2008-11-08 12:30:48.000000000 +0100 @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE fontconfig SYSTEM "../fonts.dtd"> +<fontconfig> + <!-- /etc/fonts/conf.d/20-unhint-small-dejavu-serif.conf + + Disable hinting manually at smaller sizes (< 8ppem) + This is a copy of the Bistream Vera fonts fonts rule, as DejaVu is + derived from Vera. + + The Bistream Vera fonts have GASP entries suggesting that hinting be + disabled below 8 ppem, but FreeType ignores those, preferring to use + the data found in the instructed hints. The initial Vera release + didn't include the right instructions in the 'prep' table. + --> + <match target="font"> + <test name="family"> + <string>DejaVu Serif</string> + </test> + <test compare="less" name="pixelsize"> + <double>7.5</double> + </test> + <edit name="hinting"> + <bool>false</bool> + </edit> + </match> +</fontconfig> diff -uNr dejavu-fonts-2.26.orig/fontconfig/57-dejavu.conf dejavu-fonts-2.26/fontconfig/57-dejavu.conf --- dejavu-fonts-2.26.orig/fontconfig/57-dejavu.conf 2007-10-28 21:22:07.000000000 +0100 +++ dejavu-fonts-2.26/fontconfig/57-dejavu.conf 1970-01-01 01:00:00.000000000 +0100 @@ -1,190 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE fontconfig SYSTEM "../fonts.dtd"> -<!-- /etc/fonts/conf.d/57-dejavu.conf - - Define aliasing and other fontconfig settings for - DejaVu stable families - - © 2006-2007 Nicolas Mailhot <nicolas.mailhot at laposte.net> ---> -<fontconfig> - <!-- Font substitution rules --> - <alias binding="same"> - <family>Arev Sans</family> - <accept> - <family>DejaVu Sans</family> - </accept> - </alias> - <alias binding="same"> - <family>Bepa</family> - <accept> - <family>DejaVu Sans</family> - </accept> - </alias> - <alias binding="same"> - <family>Bitstream Prima Sans</family> - <accept> - <family>DejaVu Sans</family> - </accept> - </alias> - <alias binding="same"> - <family>Bitstream Vera Sans</family> - <accept> - <family>DejaVu Sans</family> - </accept> - </alias> - <alias binding="same"> - <family>DejaVu LGC Sans</family> - <accept> - <family>DejaVu Sans</family> - </accept> - </alias> - <alias binding="same"> - <family>Hunky Sans</family> - <accept> - <family>DejaVu Sans</family> - </accept> - </alias> - <alias binding="same"> - <family>Olwen Sans</family> - <accept> - <family>DejaVu Sans</family> - </accept> - </alias> - <alias binding="same"> - <family>SUSE Sans</family> - <accept> - <family>DejaVu Sans</family> - </accept> - </alias> - <alias binding="same"> - <family>Verajja</family> - <accept> - <family>DejaVu Sans</family> - </accept> - </alias> - <!-- In case VerajjaPDA stops declaring itself as Verajja --> - <alias binding="same"> - <family>VerajjaPDA</family> - <accept> - <family>DejaVu Sans</family> - </accept> - </alias> - <alias binding="same"> - <family>Bepa Mono</family> - <accept> - <family>DejaVu Sans Mono</family> - </accept> - </alias> - <alias binding="same"> - <family>Bitstream Prima Sans Mono</family> - <accept> - <family>DejaVu Sans Mono</family> - </accept> - </alias> - <alias binding="same"> - <family>Bitstream Vera Sans Mono</family> - <accept> - <family>DejaVu Sans Mono</family> - </accept> - </alias> - <alias binding="same"> - <family>DejaVu LGC Sans Mono</family> - <accept> - <family>DejaVu Sans Mono</family> - </accept> - </alias> - <alias binding="same"> - <family>Olwen Sans Mono</family> - <accept> - <family>DejaVu Sans Mono</family> - </accept> - </alias> - <alias binding="same"> - <family>SUSE Sans Mono</family> - <accept> - <family>DejaVu Sans Mono</family> - </accept> - </alias> - <alias binding="same"> - <family>Bitstream Prima Serif</family> - <accept> - <family>DejaVu Serif</family> - </accept> - </alias> - <alias binding="same"> - <family>Bitstream Vera Serif</family> - <accept> - <family>DejaVu Serif</family> - </accept> - </alias> - <alias binding="same"> - <family>DejaVu LGC Serif</family> - <accept> - <family>DejaVu Serif</family> - </accept> - </alias> - <alias binding="same"> - <family>Hunky Serif</family> - <accept> - <family>DejaVu Serif</family> - </accept> - </alias> - <alias binding="same"> - <family>Olwen Serif</family> - <accept> - <family>DejaVu Serif</family> - </accept> - </alias> - <alias binding="same"> - <family>SUSE Serif</family> - <accept> - <family>DejaVu Serif</family> - </accept> - </alias> - <!-- In case Verajja Serif stops declaring itself as DejaVu Serif --> - <alias binding="same"> - <family>Verajja Serif</family> - <accept> - <family>DejaVu Serif</family> - </accept> - </alias> - <!-- Generic name assignment --> - <alias> - <family>DejaVu Sans Mono</family> - <default> - <family>monospace</family> - </default> - </alias> - <alias> - <family>DejaVu Sans</family> - <default> - <family>sans-serif</family> - </default> - </alias> - <alias> - <family>DejaVu Serif</family> - <default> - <family>serif</family> - </default> - </alias> - <!-- Generic name aliasing --> - <alias> - <family>monospace</family> - <prefer> - <family>DejaVu Sans Mono</family> - </prefer> - </alias> - <alias> - <family>sans-serif</family> - <prefer> - <family>DejaVu Sans</family> - </prefer> - </alias> - <alias> - <family>serif</family> - <prefer> - <family>DejaVu Serif</family> - </prefer> - </alias> -</fontconfig> diff -uNr dejavu-fonts-2.26.orig/fontconfig/57-dejavu-sans.conf dejavu-fonts-2.26/fontconfig/57-dejavu-sans.conf --- dejavu-fonts-2.26.orig/fontconfig/57-dejavu-sans.conf 1970-01-01 01:00:00.000000000 +0100 +++ dejavu-fonts-2.26/fontconfig/57-dejavu-sans.conf 2008-11-08 12:30:48.000000000 +0100 @@ -0,0 +1,87 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE fontconfig SYSTEM "../fonts.dtd"> +<!-- /etc/fonts/conf.d/57-dejavu-sans.conf + + Define aliasing and other fontconfig settings for + DejaVu Sans. + + © 2006-2008 Nicolas Mailhot <nicolas.mailhot at laposte.net> +--> +<fontconfig> + <!-- Font substitution rules --> + <alias binding="same"> + <family>Arev Sans</family> + <accept> + <family>DejaVu Sans</family> + </accept> + </alias> + <alias binding="same"> + <family>Bepa</family> + <accept> + <family>DejaVu Sans</family> + </accept> + </alias> + <alias binding="same"> + <family>Bitstream Prima Sans</family> + <accept> + <family>DejaVu Sans</family> + </accept> + </alias> + <alias binding="same"> + <family>Bitstream Vera Sans</family> + <accept> + <family>DejaVu Sans</family> + </accept> + </alias> + <alias binding="same"> + <family>DejaVu LGC Sans</family> + <accept> + <family>DejaVu Sans</family> + </accept> + </alias> + <alias binding="same"> + <family>Hunky Sans</family> + <accept> + <family>DejaVu Sans</family> + </accept> + </alias> + <alias binding="same"> + <family>Olwen Sans</family> + <accept> + <family>DejaVu Sans</family> + </accept> + </alias> + <alias binding="same"> + <family>SUSE Sans</family> + <accept> + <family>DejaVu Sans</family> + </accept> + </alias> + <alias binding="same"> + <family>Verajja</family> + <accept> + <family>DejaVu Sans</family> + </accept> + </alias> + <!-- In case VerajjaPDA stops declaring itself as Verajja --> + <alias binding="same"> + <family>VerajjaPDA</family> + <accept> + <family>DejaVu Sans</family> + </accept> + </alias> + <!-- Generic name assignment --> + <alias> + <family>DejaVu Sans</family> + <default> + <family>sans-serif</family> + </default> + </alias> + <!-- Generic name aliasing --> + <alias> + <family>sans-serif</family> + <prefer> + <family>DejaVu Sans</family> + </prefer> + </alias> +</fontconfig> diff -uNr dejavu-fonts-2.26.orig/fontconfig/57-dejavu-sans-mono.conf dejavu-fonts-2.26/fontconfig/57-dejavu-sans-mono.conf --- dejavu-fonts-2.26.orig/fontconfig/57-dejavu-sans-mono.conf 1970-01-01 01:00:00.000000000 +0100 +++ dejavu-fonts-2.26/fontconfig/57-dejavu-sans-mono.conf 2008-11-08 12:32:17.000000000 +0100 @@ -0,0 +1,62 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE fontconfig SYSTEM "../fonts.dtd"> +<!-- /etc/fonts/conf.d/57-dejavu-sans-mono.conf + + Define aliasing and other fontconfig settings for + DejaVu Sans Mono. + + © 2006-2008 Nicolas Mailhot <nicolas.mailhot at laposte.net> +--> +<fontconfig> + <!-- Font substitution rules --> + <alias binding="same"> + <family>Bepa Mono</family> + <accept> + <family>DejaVu Sans Mono</family> + </accept> + </alias> + <alias binding="same"> + <family>Bitstream Prima Sans Mono</family> + <accept> + <family>DejaVu Sans Mono</family> + </accept> + </alias> + <alias binding="same"> + <family>Bitstream Vera Sans Mono</family> + <accept> + <family>DejaVu Sans Mono</family> + </accept> + </alias> + <alias binding="same"> + <family>DejaVu LGC Sans Mono</family> + <accept> + <family>DejaVu Sans Mono</family> + </accept> + </alias> + <alias binding="same"> + <family>Olwen Sans Mono</family> + <accept> + <family>DejaVu Sans Mono</family> + </accept> + </alias> + <alias binding="same"> + <family>SUSE Sans Mono</family> + <accept> + <family>DejaVu Sans Mono</family> + </accept> + </alias> + <!-- Generic name assignment --> + <alias> + <family>DejaVu Sans Mono</family> + <default> + <family>monospace</family> + </default> + </alias> + <!-- Generic name aliasing --> + <alias> + <family>monospace</family> + <prefer> + <family>DejaVu Sans Mono</family> + </prefer> + </alias> +</fontconfig> diff -uNr dejavu-fonts-2.26.orig/fontconfig/57-dejavu-serif.conf dejavu-fonts-2.26/fontconfig/57-dejavu-serif.conf --- dejavu-fonts-2.26.orig/fontconfig/57-dejavu-serif.conf 1970-01-01 01:00:00.000000000 +0100 +++ dejavu-fonts-2.26/fontconfig/57-dejavu-serif.conf 2008-11-08 12:32:32.000000000 +0100 @@ -0,0 +1,69 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE fontconfig SYSTEM "../fonts.dtd"> +<!-- /etc/fonts/conf.d/57-dejavu-serif.conf + + Define aliasing and other fontconfig settings for + DejaVu Serif. + + © 2006-2008 Nicolas Mailhot <nicolas.mailhot at laposte.net> +--> +<fontconfig> + <!-- Font substitution rules --> + <alias binding="same"> + <family>Bitstream Prima Serif</family> + <accept> + <family>DejaVu Serif</family> + </accept> + </alias> + <alias binding="same"> + <family>Bitstream Vera Serif</family> + <accept> + <family>DejaVu Serif</family> + </accept> + </alias> + <alias binding="same"> + <family>DejaVu LGC Serif</family> + <accept> + <family>DejaVu Serif</family> + </accept> + </alias> + <alias binding="same"> + <family>Hunky Serif</family> + <accept> + <family>DejaVu Serif</family> + </accept> + </alias> + <alias binding="same"> + <family>Olwen Serif</family> + <accept> + <family>DejaVu Serif</family> + </accept> + </alias> + <alias binding="same"> + <family>SUSE Serif</family> + <accept> + <family>DejaVu Serif</family> + </accept> + </alias> + <!-- In case Verajja Serif stops declaring itself as DejaVu Serif --> + <alias binding="same"> + <family>Verajja Serif</family> + <accept> + <family>DejaVu Serif</family> + </accept> + </alias> + <!-- Generic name assignment --> + <alias> + <family>DejaVu Serif</family> + <default> + <family>serif</family> + </default> + </alias> + <!-- Generic name aliasing --> + <alias> + <family>serif</family> + <prefer> + <family>DejaVu Serif</family> + </prefer> + </alias> +</fontconfig> diff -uNr dejavu-fonts-2.26.orig/fontconfig/58-dejavu-lgc.conf dejavu-fonts-2.26/fontconfig/58-dejavu-lgc.conf --- dejavu-fonts-2.26.orig/fontconfig/58-dejavu-lgc.conf 2007-10-28 21:22:07.000000000 +0100 +++ dejavu-fonts-2.26/fontconfig/58-dejavu-lgc.conf 1970-01-01 01:00:00.000000000 +0100 @@ -1,216 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE fontconfig SYSTEM "../fonts.dtd"> -<!-- /etc/fonts/conf.d/58-dejavu-lgc.conf - - Define aliasing and other fontconfig settings for - DejaVu LGC - - © 2007 Nicolas Mailhot <nicolas.mailhot at laposte.net> ---> -<fontconfig> - <!-- Font substitution rules --> - <alias binding="same"> - <family>Arev Sans</family> - <accept> - <family>DejaVu LGC Sans</family> - </accept> - </alias> - <alias binding="same"> - <family>Bepa</family> - <accept> - <family>DejaVu LGC Sans</family> - </accept> - </alias> - <alias binding="same"> - <family>Bitstream Prima Sans</family> - <accept> - <family>DejaVu LGC Sans</family> - </accept> - </alias> - <alias binding="same"> - <family>Bitstream Vera Sans</family> - <accept> - <family>DejaVu LGC Sans</family> - </accept> - </alias> - <alias binding="same"> - <family>DejaVu Sans</family> - <accept> - <family>DejaVu LGC Sans</family> - </accept> - </alias> - <alias binding="same"> - <family>Hunky Sans</family> - <accept> - <family>DejaVu LGC Sans</family> - </accept> - </alias> - <alias binding="same"> - <family>Olwen Sans</family> - <accept> - <family>DejaVu LGC Sans</family> - </accept> - </alias> - <alias binding="same"> - <family>SUSE Sans</family> - <accept> - <family>DejaVu LGC Sans</family> - </accept> - </alias> - <alias binding="same"> - <family>Verajja</family> - <accept> - <family>DejaVu LGC Sans</family> - </accept> - </alias> - <!-- In case VerajjaPDA stops declaring itself as Verajja --> - <alias binding="same"> - <family>VerajjaPDA</family> - <accept> - <family>DejaVu LGC Sans</family> - </accept> - </alias> - <alias binding="same"> - <family>DejaVu Sans Condensed</family> - <accept> - <family>DejaVu LGC Sans Condensed</family> - </accept> - </alias> - <alias binding="same"> - <family>Toga Sans</family> - <accept> - <family>DejaVu LGC Sans Condensed</family> - </accept> - </alias> - <alias binding="same"> - <family>Bepa Mono</family> - <accept> - <family>DejaVu LGC Sans Mono</family> - </accept> - </alias> - <alias binding="same"> - <family>Bitstream Prima Sans Mono</family> - <accept> - <family>DejaVu LGC Sans Mono</family> - </accept> - </alias> - <alias binding="same"> - <family>Bitstream Vera Sans Mono</family> - <accept> - <family>DejaVu LGC Sans Mono</family> - </accept> - </alias> - <alias binding="same"> - <family>DejaVu Sans Mono</family> - <accept> - <family>DejaVu LGC Sans Mono</family> - </accept> - </alias> - <alias binding="same"> - <family>Olwen Sans Mono</family> - <accept> - <family>DejaVu LGC Sans Mono</family> - </accept> - </alias> - <alias binding="same"> - <family>SUSE Sans Mono</family> - <accept> - <family>DejaVu LGC Sans Mono</family> - </accept> - </alias> - <alias binding="same"> - <family>Bitstream Prima Serif</family> - <accept> - <family>DejaVu LGC Serif</family> - </accept> - </alias> - <alias binding="same"> - <family>Bitstream Vera Serif</family> - <accept> - <family>DejaVu LGC Serif</family> - </accept> - </alias> - <alias binding="same"> - <family>DejaVu Serif</family> - <accept> - <family>DejaVu LGC Serif</family> - </accept> - </alias> - <alias binding="same"> - <family>Hunky Serif</family> - <accept> - <family>DejaVu LGC Serif</family> - </accept> - </alias> - <alias binding="same"> - <family>Olwen Serif</family> - <accept> - <family>DejaVu LGC Serif</family> - </accept> - </alias> - <alias binding="same"> - <family>SUSE Serif</family> - <accept> - <family>DejaVu LGC Serif</family> - </accept> - </alias> - <!-- In case Verajja Serif stops declaring itself as DejaVu LGC Serif --> - <alias binding="same"> - <family>Verajja Serif</family> - <accept> - <family>DejaVu LGC Serif</family> - </accept> - </alias> - <alias binding="same"> - <family>DejaVu Serif Condensed</family> - <accept> - <family>DejaVu LGC Serif Condensed</family> - </accept> - </alias> - <alias binding="same"> - <family>Toga Serif</family> - <accept> - <family>DejaVu LGC Serif Condensed</family> - </accept> - </alias> - <!-- Generic name assignment --> - <alias> - <family>DejaVu LGC Sans Mono</family> - <default> - <family>monospace</family> - </default> - </alias> - <alias> - <family>DejaVu LGC Sans</family> - <family>DejaVu LGC Sans Condensed</family> - <default> - <family>sans-serif</family> - </default> - </alias> - <alias> - <family>DejaVu LGC Serif</family> - <family>DejaVu LGC Serif Condensed</family> - <default> - <family>serif</family> - </default> - </alias> - <!-- Generic name aliasing --> - <alias> - <family>monospace</family> - <prefer> - <family>DejaVu LGC Sans Mono</family> - </prefer> - </alias> - <alias> - <family>sans-serif</family> - <prefer> - <family>DejaVu LGC Sans</family> - </prefer> - </alias> - <alias> - <family>serif</family> - <prefer> - <family>DejaVu LGC Serif</family> - </prefer> - </alias> -</fontconfig> diff -uNr dejavu-fonts-2.26.orig/fontconfig/58-dejavu-lgc-sans.conf dejavu-fonts-2.26/fontconfig/58-dejavu-lgc-sans.conf --- dejavu-fonts-2.26.orig/fontconfig/58-dejavu-lgc-sans.conf 1970-01-01 01:00:00.000000000 +0100 +++ dejavu-fonts-2.26/fontconfig/58-dejavu-lgc-sans.conf 2008-11-08 12:30:48.000000000 +0100 @@ -0,0 +1,87 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE fontconfig SYSTEM "../fonts.dtd"> +<!-- /etc/fonts/conf.d/58-dejavu-lgc-sans.conf + + Define aliasing and other fontconfig settings for + DejaVu LGC Sans. + + © 2006-2008 Nicolas Mailhot <nicolas.mailhot at laposte.net> +--> +<fontconfig> + <!-- Font substitution rules --> + <alias binding="same"> + <family>Arev Sans</family> + <accept> + <family>DejaVu LGC Sans</family> + </accept> + </alias> + <alias binding="same"> + <family>Bepa</family> + <accept> + <family>DejaVu LGC Sans</family> + </accept> + </alias> + <alias binding="same"> + <family>Bitstream Prima Sans</family> + <accept> + <family>DejaVu LGC Sans</family> + </accept> + </alias> + <alias binding="same"> + <family>Bitstream Vera Sans</family> + <accept> + <family>DejaVu LGC Sans</family> + </accept> + </alias> + <alias binding="same"> + <family>DejaVu Sans</family> + <accept> + <family>DejaVu LGC Sans</family> + </accept> + </alias> + <alias binding="same"> + <family>Hunky Sans</family> + <accept> + <family>DejaVu LGC Sans</family> + </accept> + </alias> + <alias binding="same"> + <family>Olwen Sans</family> + <accept> + <family>DejaVu LGC Sans</family> + </accept> + </alias> + <alias binding="same"> + <family>SUSE Sans</family> + <accept> + <family>DejaVu LGC Sans</family> + </accept> + </alias> + <alias binding="same"> + <family>Verajja</family> + <accept> + <family>DejaVu LGC Sans</family> + </accept> + </alias> + <!-- In case VerajjaPDA stops declaring itself as Verajja --> + <alias binding="same"> + <family>VerajjaPDA</family> + <accept> + <family>DejaVu LGC Sans</family> + </accept> + </alias> + <!-- Generic name assignment --> + <alias> + <family>DejaVu LGC Sans</family> + <default> + <family>sans-serif</family> + </default> + </alias> + <!-- Generic name aliasing --> + <alias> + <family>sans-serif</family> + <prefer> + <family>DejaVu LGC Sans</family> + </prefer> + </alias> +</fontconfig> diff -uNr dejavu-fonts-2.26.orig/fontconfig/58-dejavu-lgc-sans-mono.conf dejavu-fonts-2.26/fontconfig/58-dejavu-lgc-sans-mono.conf --- dejavu-fonts-2.26.orig/fontconfig/58-dejavu-lgc-sans-mono.conf 1970-01-01 01:00:00.000000000 +0100 +++ dejavu-fonts-2.26/fontconfig/58-dejavu-lgc-sans-mono.conf 2008-11-08 12:30:48.000000000 +0100 @@ -0,0 +1,62 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE fontconfig SYSTEM "../fonts.dtd"> +<!-- /etc/fonts/conf.d/58-dejavu-lgc-sans-mono.conf + + Define aliasing and other fontconfig settings for + DejaVu LGC Sans Mono. + + © 2006-2008 Nicolas Mailhot <nicolas.mailhot at laposte.net> +--> +<fontconfig> + <!-- Font substitution rules --> + <alias binding="same"> + <family>Bepa Mono</family> + <accept> + <family>DejaVu LGC Sans Mono</family> + </accept> + </alias> + <alias binding="same"> + <family>Bitstream Prima Sans Mono</family> + <accept> + <family>DejaVu LGC Sans Mono</family> + </accept> + </alias> + <alias binding="same"> + <family>Bitstream Vera Sans Mono</family> + <accept> + <family>DejaVu LGC Sans Mono</family> + </accept> + </alias> + <alias binding="same"> + <family>DejaVu Sans Mono</family> + <accept> + <family>DejaVu LGC Sans Mono</family> + </accept> + </alias> + <alias binding="same"> + <family>Olwen Sans Mono</family> + <accept> + <family>DejaVu LGC Sans Mono</family> + </accept> + </alias> + <alias binding="same"> + <family>SUSE Sans Mono</family> + <accept> + <family>DejaVu LGC Sans Mono</family> + </accept> + </alias> + <!-- Generic name assignment --> + <alias> + <family>DejaVu LGC Sans Mono</family> + <default> + <family>monospace</family> + </default> + </alias> + <!-- Generic name aliasing --> + <alias> + <family>monospace</family> + <prefer> + <family>DejaVu LGC Sans Mono</family> + </prefer> + </alias> +</fontconfig> diff -uNr dejavu-fonts-2.26.orig/fontconfig/58-dejavu-lgc-serif.conf dejavu-fonts-2.26/fontconfig/58-dejavu-lgc-serif.conf --- dejavu-fonts-2.26.orig/fontconfig/58-dejavu-lgc-serif.conf 1970-01-01 01:00:00.000000000 +0100 +++ dejavu-fonts-2.26/fontconfig/58-dejavu-lgc-serif.conf 2008-11-08 12:30:48.000000000 +0100 @@ -0,0 +1,69 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE fontconfig SYSTEM "../fonts.dtd"> +<!-- /etc/fonts/conf.d/58-dejavu-lgc-serif.conf + + Define aliasing and other fontconfig settings for + DejaVu LGC Serif. + + © 2006-2008 Nicolas Mailhot <nicolas.mailhot at laposte.net> +--> +<fontconfig> + <!-- Font substitution rules --> + <alias binding="same"> + <family>Bitstream Prima Serif</family> + <accept> + <family>DejaVu LGC Serif</family> + </accept> + </alias> + <alias binding="same"> + <family>Bitstream Vera Serif</family> + <accept> + <family>DejaVu LGC Serif</family> + </accept> + </alias> + <alias binding="same"> + <family>DejaVu Serif</family> + <accept> + <family>DejaVu LGC Serif</family> + </accept> + </alias> + <alias binding="same"> + <family>Hunky Serif</family> + <accept> + <family>DejaVu LGC Serif</family> + </accept> + </alias> + <alias binding="same"> + <family>Olwen Serif</family> + <accept> + <family>DejaVu LGC Serif</family> + </accept> + </alias> + <alias binding="same"> + <family>SUSE Serif</family> + <accept> + <family>DejaVu LGC Serif</family> + </accept> + </alias> + <!-- In case Verajja Serif stops declaring itself as DejaVu Serif --> + <alias binding="same"> + <family>Verajja Serif</family> + <accept> + <family>DejaVu LGC Serif</family> + </accept> + </alias> + <!-- Generic name assignment --> + <alias> + <family>DejaVu LGC Serif</family> + <default> + <family>serif</family> + </default> + </alias> + <!-- Generic name aliasing --> + <alias> + <family>serif</family> + <prefer> + <family>DejaVu LGC Serif</family> + </prefer> + </alias> +</fontconfig> diff -uNr dejavu-fonts-2.26.orig/fontconfig/61-dejavu-experimental.conf dejavu-fonts-2.26/fontconfig/61-dejavu-experimental.conf --- dejavu-fonts-2.26.orig/fontconfig/61-dejavu-experimental.conf 2007-10-28 21:22:07.000000000 +0100 +++ dejavu-fonts-2.26/fontconfig/61-dejavu-experimental.conf 1970-01-01 01:00:00.000000000 +0100 @@ -1,49 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE fontconfig SYSTEM "../fonts.dtd"> -<!-- /etc/fonts/conf.d/61-dejavu-experimental.conf - - Define aliasing and other fontconfig settings for - DejaVu experimental families - - © 2006-2007 Nicolas Mailhot <nicolas.mailhot at laposte.net> ---> -<fontconfig> - <!-- Font substitution rules --> - <alias binding="same"> - <family>DejaVu LGC Sans Condensed</family> - <accept> - <family>DejaVu Sans Condensed</family> - </accept> - </alias> - <alias binding="same"> - <family>Toga Sans</family> - <accept> - <family>DejaVu Sans Condensed</family> - </accept> - </alias> - <alias binding="same"> - <family>DejaVu LGC Serif Condensed</family> - <accept> - <family>DejaVu Serif Condensed</family> - </accept> - </alias> - <alias binding="same"> - <family>Toga Serif</family> - <accept> - <family>DejaVu Serif Condensed</family> - </accept> - </alias> - <!-- Generic name aliasing --> - <alias> - <family>sans-serif</family> - <prefer> - <family>DejaVu Sans Condensed</family> - </prefer> - </alias> - <alias> - <family>serif</family> - <prefer> - <family>DejaVu Serif Condensed</family> - </prefer> - </alias> -</fontconfig> Index: dejavu-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts.spec,v retrieving revision 1.86 retrieving revision 1.87 diff -u -r1.86 -r1.87 --- dejavu-fonts.spec 3 Sep 2008 21:17:02 -0000 1.86 +++ dejavu-fonts.spec 8 Nov 2008 18:38:15 -0000 1.87 @@ -1,6 +1,6 @@ %define fontname dejavu -%define fontdir %{_datadir}/fonts/%{fontname} -%define fontconfdir %{_sysconfdir}/fonts/conf.d +%define fontdir %{_datadir}/fonts/%{fontname}/ +%define fontconfdir %{_sysconfdir}/fonts/conf.d/ %define archivename %{name}-%{archiveversion} @@ -14,15 +14,53 @@ %define Blocks %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/Blocks.txt %define UnicodeData %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/UnicodeData.txt +# Common description +%define common_desc \ +The DejaVu font set is based on the âBitstream Veraâ fonts, release 1.10. Its\ +purpose is to provide a wider range of characters, while maintaining the \ +original style, using an open collaborative development process. + +# Compat description +%define compat_desc \ +This package only exists to help transition pre 2.26-3 DejaVu users to the new\ +package split. It will be removed after one distribution release cycle, please\ +do not reference it or depend on it in any way.\ +\ +It can be safely uninstalled. + + +# Subpackage magic - should be generic enough for reuse in other packages +%define font_subpkg(n:f:) \ +\ +%post %{-n*} \ +if [ -x %{_bindir}/fc-cache ]; then \ + %{_bindir}/fc-cache %{fontdir} || : \ +fi \ +\ +\ +%postun %{-n*} \ +if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then \ + %{_bindir}/fc-cache %{fontdir} || : \ +fi\ +\ +\ +%files %{-n*} \ +%defattr(0644,root,root,0755) \ +\ +%{-f:%config(noreplace) %{fontconfdir}%{-f*}} \ +\ +%(echo %* | sed "s+ +\\n+g"| sed "s+^+%{fontdir}+g") + Name: %{fontname}-fonts Version: 2.26 -Release: 2%{?alphatag}%{?dist} -Summary: DejaVu fonts, mature typefaces +Release: 3%{?alphatag}%{?dist} +Summary: DejaVu fonts Group: User Interface/X License: Bitstream Vera and Public Domain URL: http://%{fontname}.sf.net/ Source0: %{?!alphatag:http://downloads.sourceforge.net/%{fontname}}%{?alphatag:%{fontname}.sourceforge.net/snapshots}/%{archivename}.tar.bz2 +Patch0: %{name}-2.26-fontconfig.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) # Older fontforge versions will not work due to sfd format changes @@ -33,149 +71,175 @@ BuildArch: noarch %description -The DejaVu fonts are a font family based on the âBitstream Veraâ fonts release -1.10. Its purpose is to provide a wider range of characters while maintaining -the original look and feel through the process of collaborative development. +%common_desc + + +%package doc +Summary: DejaVu fonts, documentation +Group: User Interface/X -This package includes the typefaces the DejaVu project considers mature. +%description doc +%common_desc +This package consists of the DejaVu project documentation. -%package experimental + +%package compat +Summary: DejaVu fonts, compatibility Group: User Interface/X -Summary: DejaVu fonts, experimental typefaces -# Does not really make sense without the core typefaces -Requires: %{name} = %{version}-%{release} +Obsoletes: dejavu-fonts < 2.6.23 +Obsoletes: dejavu-fonts-experimental < 2.6.23 -%description experimental -The DejaVu fonts are a font family based on the "Bitstream Vera" fonts release -1.10. Its purpose is to provide a wider range of characters while maintaining -the original look and feel through the process of collaborative development. +Requires: %{name}-sans, %{name}-serif, %{name}-sans-mono -This package includes the typefaces the DejaVu project considers experimental. +%description compat +%compat_desc -%package -n %{fontname}-lgc-fonts +%package lgc-compat +Summary: DejaVu fonts, LGC compatibility Group: User Interface/X -Summary: DejaVu fonts, Latin Greek Cyrillic subset -# Could possibly conflict with the main package, as there's really no sense to -# install both -#Conflicts: %{name} <= %{version}-%{release} +Obsoletes: dejavu-lgc-fonts < 2.6.23 -%description -n %{fontname}-lgc-fonts -The DejaVu fonts are a font family based on the "Bitstream Vera" fonts release -1.10. Its purpose is to provide a wider range of characters while maintaining -the original look and feel through the process of collaborative development. +Requires: %{name}-lgc-sans, %{name}-lgc-serif, %{name}-lgc-sans-mono -This package includes a subset of DejaVu typefaces limited to Latin, Greek and -Cyrillic glyphs. +%description lgc-compat +%compat_desc -%prep -%setup -q -n %{archivename} +%package sans +Summary: DejaVu, variable-width sans-serif font faces +Group: User Interface/X +Requires: %{name}-doc = %{version}-%{release} +%description sans +%common_desc -%build -make %{?_smp_mflags} VERSION=%{version} FC-LANG="" \ - BLOCKS=%{Blocks} UNICODEDATA=%{UnicodeData} +This package consists of the DejaVu sans-serif variable-width font faces, in +their unabridged version. -%check -make check +%font_subpkg -n sans -f *-%{fontname}-sans.conf DejaVuSans.ttf DejaVuSans-*.ttf DejaVuSansCondensed*.ttf -%install -rm -fr %{buildroot} +%package serif +Summary: DejaVu, variable-width serif font faces +Group: User Interface/X +Requires: %{name}-doc = %{version}-%{release} -install -m 0755 -d %{buildroot}%{fontdir} -install -m 0644 -p build/*.ttf %{buildroot}%{fontdir} +%description serif +%common_desc -install -m 0755 -d %{buildroot}%{fontconfdir} -install -m 0644 -p fontconfig/*conf %{buildroot}%{fontconfdir} +This package consists of the DejaVu serif variable-width font faces, in their +unabridged version. +%font_subpkg -n serif -f *-%{fontname}-serif.conf DejaVuSerif.ttf DejaVuSerif-*.ttf DejaVuSerifCondensed*.ttf -%clean -rm -fr %{buildroot} +%package sans-mono +Summary: DejaVu, monospace sans-serif font faces +Group: User Interface/X +Requires: %{name}-doc = %{version}-%{release} -%post -if [ -x %{_bindir}/fc-cache ] ; then - %{_bindir}/fc-cache %{fontdir} || : -fi +%description sans-mono +%common_desc +This package consists of the DejaVu sans-serif monospace font faces, in their +unabridged version. -%postun -if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then - %{_bindir}/fc-cache %{fontdir} || : -fi +%font_subpkg -n sans-mono -f *-%{fontname}-sans-mono.conf DejaVuSansMono*.ttf -%post experimental -if [ -x %{_bindir}/fc-cache ] ; then - %{_bindir}/fc-cache %{fontdir} || : -fi +%package lgc-sans +Summary: DejaVu, variable-width sans-serif font faces, Latin-Greek-Cyrillic subset +Group: User Interface/X +Requires: %{name}-doc = %{version}-%{release} +%description lgc-sans +%common_desc -%postun experimental -if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then - %{_bindir}/fc-cache %{fontdir} || : -fi +This package consists of the DejaVu sans-serif variable-width font faces, with +unicode coverage restricted to Latin, Greek and Cyrillic. +%font_subpkg -n lgc-sans -f *-%{fontname}-lgc-sans.conf DejaVuLGCSans.ttf DejaVuLGCSans-*.ttf DejaVuLGCSansCondensed*.ttf -%post -n %{fontname}-lgc-fonts -if [ -x %{_bindir}/fc-cache ] ; then - %{_bindir}/fc-cache %{fontdir} || : -fi +%package lgc-serif +Summary: DejaVu, variable-width serif font faces, Latin-Greek-Cyrillic subset +Group: User Interface/X +Requires: %{name}-doc = %{version}-%{release} -%postun -n %{fontname}-lgc-fonts -if [ -x %{_bindir}/fc-cache ] ; then - %{_bindir}/fc-cache %{fontdir} || : -fi +%description lgc-serif +%common_desc +This package consists of the DejaVu serif variable-width font faces, with +unicode coverage restricted to Latin, Greek and Cyrillic. -%files -%defattr(0644,root,root,0755) -%doc AUTHORS BUGS LICENSE NEWS README -%doc build/unicover.txt build/langcover.txt build/status.txt +%font_subpkg -n lgc-serif -f *-%{fontname}-lgc-serif.conf DejaVuLGCSerif.ttf DejaVuLGCSerif-*.ttf DejaVuLGCSerifCondensed*.ttf -%config(noreplace) %{fontconfdir}/20-unhint-small-%{fontname}.conf -%config(noreplace) %{fontconfdir}/57-%{fontname}.conf -%dir %{fontdir}/ -%{fontdir}/*.ttf -%exclude %{fontdir}/DejaVu*Condensed*.ttf -%exclude %{fontdir}/DejaVu*ExtraLight*.ttf -%exclude %{fontdir}/DejaVuSerif*Italic.ttf -%exclude %{fontdir}/DejaVuLGC*.ttf +%package lgc-sans-mono +Summary: DejaVu, monospace sans-serif font faces, Latin-Greek-Cyrillic subset +Group: User Interface/X +Requires: %{name}-doc = %{version}-%{release} +%description lgc-sans-mono +%common_desc -%files experimental -%defattr(0644,root,root,0755) +This package consists of the DejaVu sans-serif monospace font faces, with +unicode coverage restricted to Latin, Greek and Cyrillic. + +%font_subpkg -n lgc-sans-mono -f *-%{fontname}-lgc-sans-mono.conf DejaVuLGCSansMono*.ttf + + +%prep +%setup -q -n %{archivename} +%patch0 -p1 + + +%build +make %{?_smp_mflags} VERSION=%{version} FC-LANG="" \ + BLOCKS=%{Blocks} UNICODEDATA=%{UnicodeData} + +# Stop the spin people from complaining this file is too big +bzip2 -9 build/status.txt + + +%check +make check -%config(noreplace) %{fontconfdir}/20-unhint-small-%{fontname}-experimental.conf -%config(noreplace) %{fontconfdir}/61-%{fontname}-experimental.conf -%{fontdir}/DejaVu*Condensed*.ttf -%{fontdir}/DejaVu*ExtraLight*.ttf -%{fontdir}/DejaVuSerif*Italic.ttf +%install +rm -fr %{buildroot} + +install -m 0755 -d %{buildroot}%{fontdir} +install -m 0644 -p build/*.ttf %{buildroot}%{fontdir} + +install -m 0755 -d %{buildroot}%{fontconfdir} +install -m 0644 -p fontconfig/*conf %{buildroot}%{fontconfdir} -%exclude %{fontdir}/DejaVuLGC*.ttf +%clean +rm -fr %{buildroot} -%files -n %{fontname}-lgc-fonts +%files doc %defattr(0644,root,root,0755) %doc AUTHORS BUGS LICENSE NEWS README -%doc build/unicover-lgc.txt build/langcover-lgc.txt - -%config(noreplace) %{fontconfdir}/20-unhint-small-%{fontname}-lgc.conf -%config(noreplace) %{fontconfdir}/58-%{fontname}-lgc.conf +%doc build/unicover.txt build/status.txt.bz2 +# May as well put it in the common doc package %dir %{fontdir}/ -%{fontdir}/DejaVuLGC*.ttf %changelog +* Sat Nov 8 2008 Nicolas Mailhot <nicolas.mailhot at laposte.net> +- 2.26-3 +⧠Package split reorganisation, following font family lines +âµ Create compat packages to ease switchover at F11 time (to be discontinued + for F12) +⬳ compress status file + * Wed Sep 3 2008 Nicolas Mailhot <nicolas.mailhot at laposte.net> - 2.26-2 â Rebuild with pre-F10-freeze fontforge Index: import.log =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/devel/import.log,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- import.log 3 Sep 2008 21:17:02 -0000 1.3 +++ import.log 8 Nov 2008 18:38:15 -0000 1.4 @@ -1,3 +1,4 @@ dejavu-fonts-2_25-2_fc10:HEAD:dejavu-fonts-2.25-2.fc10.src.rpm:1215806350 dejavu-fonts-2_26-1_fc10:HEAD:dejavu-fonts-2.26-1.fc10.src.rpm:1217165726 dejavu-fonts-2_26-2_fc10:HEAD:dejavu-fonts-2.26-2.fc10.src.rpm:1220476598 +dejavu-fonts-2_26-3_fc11:HEAD:dejavu-fonts-2.26-3.fc11.src.rpm:1226169315 _______________________________________________ Fedora-fonts-bugs-list mailing list Fedora-fonts-bugs-list@redhat.com https://www.redhat.com/mailman/listinfo/fedora-fonts-bugs-list