From 6aa16f0386843376a60bea6d7719b9d15943a60a Mon Sep 17 00:00:00 2001
From: nim <nim@fedoraproject.org>
Date: Sat, 27 Oct 2007 09:26:57 +0000
Subject: [PATCH] more cleanups

---
 .cvsignore                                    |   2 +-
 ...-experimental-fontconfig-unhint-small.conf |  48 ---
 dejavu-fonts-experimental-fontconfig.conf     |  57 ----
 dejavu-fonts-fontconfig-unhint-small.conf     |  48 ---
 dejavu-fonts-fontconfig.conf                  | 241 ---------------
 dejavu-fonts-lgc-fontconfig-unhint-small.conf |  70 -----
 dejavu-fonts-lgc-fontconfig.conf              | 276 ------------------
 dejavu-fonts.spec                             |  29 +-
 sources                                       |   2 +-
 9 files changed, 11 insertions(+), 762 deletions(-)
 delete mode 100644 dejavu-fonts-experimental-fontconfig-unhint-small.conf
 delete mode 100644 dejavu-fonts-experimental-fontconfig.conf
 delete mode 100644 dejavu-fonts-fontconfig-unhint-small.conf
 delete mode 100644 dejavu-fonts-fontconfig.conf
 delete mode 100644 dejavu-fonts-lgc-fontconfig-unhint-small.conf
 delete mode 100644 dejavu-fonts-lgc-fontconfig.conf

diff --git a/.cvsignore b/.cvsignore
index 4971718..b6921a9 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-dejavu-sfd-20071025-2022.tar.bz2
+dejavu-sfd-20071027-2023.tar.bz2
diff --git a/dejavu-fonts-experimental-fontconfig-unhint-small.conf b/dejavu-fonts-experimental-fontconfig-unhint-small.conf
deleted file mode 100644
index 3fcc28b..0000000
--- a/dejavu-fonts-experimental-fontconfig-unhint-small.conf
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0"?>
-<!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 name="pixelsize" compare="less">
-      <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 name="pixelsize" compare="less">
-      <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 name="pixelsize" compare="less">
-      <double>7.5</double>
-    </test>
-    <edit name="hinting">
-      <bool>false</bool>
-    </edit>
-  </match>
-</fontconfig>
diff --git a/dejavu-fonts-experimental-fontconfig.conf b/dejavu-fonts-experimental-fontconfig.conf
deleted file mode 100644
index 3ac5203..0000000
--- a/dejavu-fonts-experimental-fontconfig.conf
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- /etc/fonts/conf.d/61-dejavu-experimental.conf
-
-     Define aliasing and other fontconfig settings for
-     DejaVu experimental families
-
-     © 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net>
--->
-<fontconfig>
-<!-- Declare substitutes -->
-  <match>
-    <test name="family">
-      <string>DejaVu LGC Sans Condensed</string>
-    </test>
-    <edit name="family" mode="append" binding="same">
-      <string>DejaVu Sans Condensed</string>
-    </edit>
-  </match>
-  <match>
-    <test name="family">
-      <string>Toga Sans</string>
-    </test>
-    <edit name="family" mode="append" binding="same">
-      <string>DejaVu Sans Condensed</string>
-    </edit>
-  </match>
-  <match>
-    <test name="family">
-      <string>DejaVu LGC Serif Condensed</string>
-    </test>
-    <edit name="family" mode="append" binding="same">
-      <string>DejaVu Serif Condensed</string>
-    </edit>
-  </match>
-  <match>
-    <test name="family">
-      <string>Toga Serif</string>
-    </test>
-    <edit name="family" mode="append" binding="same">
-      <string>DejaVu Serif Condensed</string>
-    </edit>
-  </match>
-<!-- Assign generic name -->
-  <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>
diff --git a/dejavu-fonts-fontconfig-unhint-small.conf b/dejavu-fonts-fontconfig-unhint-small.conf
deleted file mode 100644
index dfa7aaa..0000000
--- a/dejavu-fonts-fontconfig-unhint-small.conf
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0"?>
-<!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 name="pixelsize" compare="less">
-      <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 name="pixelsize" compare="less">
-      <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 name="pixelsize" compare="less">
-      <double>7.5</double>
-    </test>
-    <edit name="hinting">
-      <bool>false</bool>
-    </edit>
-  </match>
-</fontconfig>
diff --git a/dejavu-fonts-fontconfig.conf b/dejavu-fonts-fontconfig.conf
deleted file mode 100644
index 2d960ee..0000000
--- a/dejavu-fonts-fontconfig.conf
+++ /dev/null
@@ -1,241 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- /etc/fonts/conf.d/57-dejavu.conf
-
-     Define aliasing and other fontconfig settings for
-     DejaVu stable families
-
-     © 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net>
--->
-<fontconfig>
-  <!-- Declare DejaVu Sans a valid substitute for all known Bitstream Vera Sans
-     derivatives which kept original metrics -->
-  <match>
-    <test name="family">
-      <string>Bitstream Prima Sans</string>
-    </test>
-    <edit name="family" mode="append" binding="same">
-      <string>DejaVu Sans</string>
-    </edit>
-  </match>
-  <match>
-    <test name="family">
-      <string>Bitstream Vera Sans</string>
-    </test>
-    <edit name="family" mode="append" binding="same">
-      <string>DejaVu Sans</string>
-    </edit>
-  </match>
-  <match>
-    <test name="family">
-      <string>DejaVu LGC Sans</string>
-    </test>
-    <edit name="family" mode="append" binding="same">
-      <string>DejaVu Sans</string>
-    </edit>
-  </match>
-  <match>
-    <test name="family">
-      <string>Arev Sans</string>
-    </test>
-    <edit name="family" mode="append" binding="same">
-      <string>DejaVu Sans</string>
-    </edit>
-  </match>
-  <match>
-    <test name="family">
-      <string>SUSE Sans</string>
-    </test>
-    <edit name="family" mode="append" binding="same">
-      <string>DejaVu Sans</string>
-    </edit>
-  </match>
-  <match>
-    <test name="family">
-      <string>Hunky Sans</string>
-    </test>
-    <edit name="family" mode="append" binding="same">
-      <string>DejaVu Sans</string>
-    </edit>
-  </match>
-  <match>
-    <test name="family">
-      <string>Verajja</string>
-    </test>
-    <edit name="family" mode="append" binding="same">
-      <string>DejaVu Sans</string>
-    </edit>
-  </match>
-  <!-- In case VerajjaPDA stops declaring itself as Verajja -->
-  <match>
-    <test name="family">
-      <string>VerajjaPDA</string>
-    </test>
-    <edit name="family" mode="append" binding="same">
-      <string>DejaVu Sans</string>
-    </edit>
-  </match>
-  <match>
-    <test name="family">
-      <string>Bepa</string>
-    </test>
-    <edit name="family" mode="append" binding="same">
-      <string>DejaVu Sans</string>
-    </edit>
-  </match>
-  <match>
-    <test name="family">
-      <string>Olwen Sans</string>
-    </test>
-    <edit name="family" mode="append" binding="same">
-      <string>DejaVu Sans</string>
-    </edit>
-  </match>
-  <!-- Declare DejaVu Serif a valid substitute for all known Bitstream Vera Serif
-     derivatives which kept the original metrics -->
-  <match>
-    <test name="family">
-      <string>Bitstream Prima Serif</string>
-    </test>
-    <edit name="family" mode="append" binding="same">
-      <string>DejaVu Serif</string>
-    </edit>
-  </match>
-  <match>
-    <test name="family">
-      <string>Bitstream Vera Serif</string>
-    </test>
-    <edit name="family" mode="append" binding="same">
-      <string>DejaVu Serif</string>
-    </edit>
-  </match>
-  <match>
-    <test name="family">
-      <string>DejaVu LGC Serif</string>
-    </test>
-    <edit name="family" mode="append" binding="same">
-      <string>DejaVu Serif</string>
-    </edit>
-  </match>
-  <match>
-    <test name="family">
-      <string>SUSE Serif</string>
-    </test>
-    <edit name="family" mode="append" binding="same">
-      <string>DejaVu Serif</string>
-    </edit>
-  </match>
-  <match>
-    <test name="family">
-      <string>Hunky Serif</string>
-    </test>
-    <edit name="family" mode="append" binding="same">
-      <string>DejaVu Serif</string>
-    </edit>
-  </match>
-  <!-- In case Verajja Serif stops declaring itself as DejaVu Serif -->
-  <match>
-    <test name="family">
-      <string>Verajja Serif</string>
-    </test>
-    <edit name="family" mode="append" binding="same">
-      <string>DejaVu Serif</string>
-    </edit>
-  </match>
-  <match>
-    <test name="family">
-      <string>Olwen Serif</string>
-    </test>
-    <edit name="family" mode="append" binding="same">
-      <string>DejaVu Serif</string>
-    </edit>
-  </match>
-  <!-- Declare DejaVu Sans Mono a valid substitute for all known Bitstream Vera
-     Sans Mono derivatives which kept the original metrics -->
-  <match>
-    <test name="family">
-      <string>Bitstream Prima Sans Mono</string>
-    </test>
-    <edit name="family" mode="append" binding="same">
-      <string>DejaVu Sans Mono</string>
-    </edit>
-  </match>
-  <match>
-    <test name="family">
-      <string>Bitstream Vera Sans Mono</string>
-    </test>
-    <edit name="family" mode="append" binding="same">
-      <string>DejaVu Sans Mono</string>
-    </edit>
-  </match>
-  <match>
-    <test name="family">
-      <string>DejaVu LGC Sans Mono</string>
-    </test>
-    <edit name="family" mode="append" binding="same">
-      <string>DejaVu Sans Mono</string>
-    </edit>
-  </match>
-  <match>
-    <test name="family">
-      <string>SUSE Sans Mono</string>
-    </test>
-    <edit name="family" mode="append" binding="same">
-      <string>DejaVu Sans Mono</string>
-    </edit>
-  </match>
-  <match>
-    <test name="family">
-      <string>Bepa Mono</string>
-    </test>
-    <edit name="family" mode="append" binding="same">
-      <string>DejaVu Sans Mono</string>
-    </edit>
-  </match>
-  <match>
-    <test name="family">
-      <string>Olwen Sans Mono</string>
-    </test>
-    <edit name="family" mode="append" binding="same">
-      <string>DejaVu Sans Mono</string>
-    </edit>
-  </match>
-  <!-- Assign generic name -->
-  <alias>
-    <family>DejaVu Sans</family>
-    <default>
-      <family>sans-serif</family>
-    </default>
-  </alias>
-  <alias>
-    <family>DejaVu Serif</family>
-    <default>
-      <family>serif</family>
-    </default>
-  </alias>
-  <alias>
-    <family>DejaVu Sans Mono</family>
-    <default>
-      <family>monospace</family>
-    </default>
-  </alias>
-  <!-- Alias generic names -->
-  <alias>
-    <family>sans-serif</family>
-    <prefer>
-      <family>DejaVu Sans</family>
-    </prefer>
-  </alias>
-  <alias>
-    <family>serif</family>
-    <prefer>
-      <family>DejaVu Serif</family>
-    </prefer>
-  </alias>
-  <alias>
-    <family>monospace</family>
-    <prefer>
-      <family>DejaVu Sans Mono</family>
-    </prefer>
-  </alias>
-</fontconfig>
diff --git a/dejavu-fonts-lgc-fontconfig-unhint-small.conf b/dejavu-fonts-lgc-fontconfig-unhint-small.conf
deleted file mode 100644
index e702bec..0000000
--- a/dejavu-fonts-lgc-fontconfig-unhint-small.conf
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0"?>
-<!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 name="pixelsize" compare="less">
-      <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 name="pixelsize" compare="less">
-      <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 name="pixelsize" compare="less">
-      <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 name="pixelsize" compare="less">
-      <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 name="pixelsize" compare="less">
-      <double>7.5</double>
-    </test>
-    <edit name="hinting">
-      <bool>false</bool>
-    </edit>
-  </match>
-</fontconfig>
diff --git a/dejavu-fonts-lgc-fontconfig.conf b/dejavu-fonts-lgc-fontconfig.conf
deleted file mode 100644
index 0d9ef01..0000000
--- a/dejavu-fonts-lgc-fontconfig.conf
+++ /dev/null
@@ -1,276 +0,0 @@
-<?xml version="1.0"?>
-<!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>
-  <!-- Declare DejaVu LGC Sans a valid substitute for all known Bitstream Vera Sans
-     derivatives which kept original metrics -->
-  <match>
-    <test name="family">
-      <string>Bitstream Prima Sans</string>
-    </test>
-    <edit name="family" mode="append" binding="same">
-      <string>DejaVu LGC Sans</string>
-    </edit>
-  </match>
-  <match>
-    <test name="family">
-      <string>Bitstream Vera Sans</string>
-    </test>
-    <edit name="family" mode="append" binding="same">
-      <string>DejaVu LGC Sans</string>
-    </edit>
-  </match>
-  <match>
-    <test name="family">
-      <string>DejaVu Sans</string>
-    </test>
-    <edit name="family" mode="append" binding="same">
-      <string>DejaVu LGC Sans</string>
-    </edit>
-  </match>
-  <match>
-    <test name="family">
-      <string>Arev Sans</string>
-    </test>
-    <edit name="family" mode="append" binding="same">
-      <string>DejaVu LGC Sans</string>
-    </edit>
-  </match>
-  <match>
-    <test name="family">
-      <string>SUSE Sans</string>
-    </test>
-    <edit name="family" mode="append" binding="same">
-      <string>DejaVu LGC Sans</string>
-    </edit>
-  </match>
-  <match>
-    <test name="family">
-      <string>Hunky Sans</string>
-    </test>
-    <edit name="family" mode="append" binding="same">
-      <string>DejaVu LGC Sans</string>
-    </edit>
-  </match>
-  <match>
-    <test name="family">
-      <string>Verajja</string>
-    </test>
-    <edit name="family" mode="append" binding="same">
-      <string>DejaVu LGC Sans</string>
-    </edit>
-  </match>
-  <!-- In case VerajjaPDA stops declaring itself as Verajja -->
-  <match>
-    <test name="family">
-      <string>VerajjaPDA</string>
-    </test>
-    <edit name="family" mode="append" binding="same">
-      <string>DejaVu LGC Sans</string>
-    </edit>
-  </match>
-  <match>
-    <test name="family">
-      <string>Bepa</string>
-    </test>
-    <edit name="family" mode="append" binding="same">
-      <string>DejaVu LGC Sans</string>
-    </edit>
-  </match>
-  <match>
-    <test name="family">
-      <string>Olwen Sans</string>
-    </test>
-    <edit name="family" mode="append" binding="same">
-      <string>DejaVu LGC Sans</string>
-    </edit>
-  </match>
-  <!-- Declare DejaVu LGC Serif a valid substitute for all known Bitstream Vera Serif
-     derivatives which kept the original metrics -->
-  <match>
-    <test name="family">
-      <string>Bitstream Prima Serif</string>
-    </test>
-    <edit name="family" mode="append" binding="same">
-      <string>DejaVu LGC Serif</string>
-    </edit>
-  </match>
-  <match>
-    <test name="family">
-      <string>Bitstream Vera Serif</string>
-    </test>
-    <edit name="family" mode="append" binding="same">
-      <string>DejaVu LGC Serif</string>
-    </edit>
-  </match>
-  <match>
-    <test name="family">
-      <string>DejaVu Serif</string>
-    </test>
-    <edit name="family" mode="append" binding="same">
-      <string>DejaVu LGC Serif</string>
-    </edit>
-  </match>
-  <match>
-    <test name="family">
-      <string>SUSE Serif</string>
-    </test>
-    <edit name="family" mode="append" binding="same">
-      <string>DejaVu LGC Serif</string>
-    </edit>
-  </match>
-  <match>
-    <test name="family">
-      <string>Hunky Serif</string>
-    </test>
-    <edit name="family" mode="append" binding="same">
-      <string>DejaVu LGC Serif</string>
-    </edit>
-  </match>
-  <!-- In case Verajja Serif stops declaring itself as DejaVu LGC Serif -->
-  <match>
-    <test name="family">
-      <string>Verajja Serif</string>
-    </test>
-    <edit name="family" mode="append" binding="same">
-      <string>DejaVu LGC Serif</string>
-    </edit>
-  </match>
-  <match>
-    <test name="family">
-      <string>Olwen Serif</string>
-    </test>
-    <edit name="family" mode="append" binding="same">
-      <string>DejaVu LGC Serif</string>
-    </edit>
-  </match>
-  <!-- Declare DejaVu LGC Sans Mono a valid substitute for all known Bitstream Vera
-     Sans Mono derivatives which kept the original metrics -->
-  <match>
-    <test name="family">
-      <string>Bitstream Prima Sans Mono</string>
-    </test>
-    <edit name="family" mode="append" binding="same">
-      <string>DejaVu LGC Sans Mono</string>
-    </edit>
-  </match>
-  <match>
-    <test name="family">
-      <string>Bitstream Vera Sans Mono</string>
-    </test>
-    <edit name="family" mode="append" binding="same">
-      <string>DejaVu LGC Sans Mono</string>
-    </edit>
-  </match>
-  <match>
-    <test name="family">
-      <string>DejaVu Sans Mono</string>
-    </test>
-    <edit name="family" mode="append" binding="same">
-      <string>DejaVu LGC Sans Mono</string>
-    </edit>
-  </match>
-  <match>
-    <test name="family">
-      <string>SUSE Sans Mono</string>
-    </test>
-    <edit name="family" mode="append" binding="same">
-      <string>DejaVu LGC Sans Mono</string>
-    </edit>
-  </match>
-  <match>
-    <test name="family">
-      <string>Bepa Mono</string>
-    </test>
-    <edit name="family" mode="append" binding="same">
-      <string>DejaVu LGC Sans Mono</string>
-    </edit>
-  </match>
-  <match>
-    <test name="family">
-      <string>Olwen Sans Mono</string>
-    </test>
-    <edit name="family" mode="append" binding="same">
-      <string>DejaVu LGC Sans Mono</string>
-    </edit>
-  </match>
-  <!-- Condensed families -->
-  <match>
-    <test name="family">
-      <string>DejaVu Sans Condensed</string>
-    </test>
-    <edit name="family" mode="append" binding="same">
-      <string>DejaVu LGC Sans Condensed</string>
-    </edit>
-  </match>
-  <match>
-    <test name="family">
-      <string>Toga Sans</string>
-    </test>
-    <edit name="family" mode="append" binding="same">
-      <string>DejaVu LGC Sans Condensed</string>
-    </edit>
-  </match>
-  <match>
-    <test name="family">
-      <string>DejaVu Serif Condensed</string>
-    </test>
-    <edit name="family" mode="append" binding="same">
-      <string>DejaVu LGC Serif Condensed</string>
-    </edit>
-  </match>
-  <match>
-    <test name="family">
-      <string>Toga Serif</string>
-    </test>
-    <edit name="family" mode="append" binding="same">
-      <string>DejaVu LGC Serif Condensed</string>
-    </edit>
-  </match>
-  <!-- Assign generic name -->
-  <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>
-  <alias>
-    <family>DejaVu LGC Sans Mono</family>
-    <default>
-      <family>monospace</family>
-    </default>
-  </alias>
-  <!-- Alias generic names -->
-  <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>
-  <alias>
-    <family>monospace</family>
-    <prefer>
-      <family>DejaVu LGC Sans Mono</family>
-    </prefer>
-  </alias>
-</fontconfig>
diff --git a/dejavu-fonts.spec b/dejavu-fonts.spec
index 6eb4ac0..64dae67 100644
--- a/dejavu-fonts.spec
+++ b/dejavu-fonts.spec
@@ -4,10 +4,10 @@
 
 %define archivename     %{fontname}-sfd-%{archiveversion}
 
-%define alphatag        .20071025svn2022
+%define alphatag        .20071027svn2023
 #define alphatag        .rc1
 
-%define archiveversion  20071025-2022
+%define archiveversion  20071027-2023
 #define archiveversion  %{version}
 
 
@@ -17,7 +17,7 @@
 
 Name:      %{fontname}-fonts
 Version:   2.21
-Release:   0.3%{?alphatag}%{?dist}
+Release:   0.4%{?alphatag}%{?dist}
 Summary:   DejaVu fonts, mature typefaces
 
 Group:     User Interface/X
@@ -25,16 +25,6 @@ License:   Modifiable & redistributable, with naming restrictions
 URL:       http://%{fontname}.sf.net/
 Source0:   %{?!alphatag:http://prdownloads.sourceforge.net/%{fontname}}%{?alphatag:%{fontname}.sourceforge.net/snapshots}/%{archivename}.tar.bz2
 
-# DejaVu fontconfig setup
-Source1:   %{name}-fontconfig.conf
-Source2:   %{name}-fontconfig-unhint-small.conf
-# DejaVu fontconfig setup (experimental families)
-Source3:   %{name}-experimental-fontconfig.conf
-Source4:   %{name}-experimental-fontconfig-unhint-small.conf
-# DejaVu LGC setup
-Source5:   %{name}-lgc-fontconfig.conf
-Source6:   %{name}-lgc-fontconfig-unhint-small.conf
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # Older fontforge versions will not work due to sfd format changes
 BuildRequires: fontforge > 20070501
@@ -104,12 +94,7 @@ install -m 0644 -p build/*.ttf  %{buildroot}%{fontdir}
 
 # Fontconfig tweaks
 install -m 0755 -d %{buildroot}%{fontconfdir}
-install -m 0644 -p %{SOURCE1} %{buildroot}%{fontconfdir}/57-%{fontname}.conf
-install -m 0644 -p %{SOURCE2} %{buildroot}%{fontconfdir}/20-unhint-small-%{fontname}.conf
-install -m 0644 -p %{SOURCE3} %{buildroot}%{fontconfdir}/61-%{fontname}-experimental.conf
-install -m 0644 -p %{SOURCE4} %{buildroot}%{fontconfdir}/20-unhint-small-%{fontname}-experimental.conf
-install -m 0644 -p %{SOURCE5} %{buildroot}%{fontconfdir}/58-%{fontname}-lgc.conf
-install -m 0644 -p %{SOURCE6} %{buildroot}%{fontconfdir}/20-unhint-small-%{fontname}-lgc.conf
+install -m 0644 -p fontconfig/*conf %{buildroot}%{fontconfdir}
 
 
 %clean
@@ -199,9 +184,13 @@ fi
 
 
 %changelog
+* Sat Oct 27 2007 <nicolas.mailhot at laposte.net>
+☺ 2.21-0.4.20071027svn2023
+ ✓ Fedora fontconfig files dropped (merged upstream)
+
 * Wed Oct 25 2007 <nicolas.mailhot at laposte.net>
 ☺ 2.21-0.3.20071025svn2022
- ✓ Makefile patch dropped upstream
+ ✓ Makefile patch dropped (merged upstream)
  ✓ add -f to fc-cache calls
  ✓ completely align LGC and FULL fontconfig rules
  ✓ remove / from directory macros
diff --git a/sources b/sources
index 0511767..e6e8fb1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6461152f93e7a0ea59b423bb343c8154  dejavu-sfd-20071025-2022.tar.bz2
+1666d279d7b9a4e7ded84e37d7edb21a  dejavu-sfd-20071027-2023.tar.bz2