diff --git a/dejavu-fonts-2.26-fontconfig.patch b/dejavu-fonts-2.26-fontconfig.patch
new file mode 100644
index 0000000..57b21f1
--- /dev/null
+++ b/dejavu-fonts-2.26-fontconfig.patch
@@ -0,0 +1,1285 @@
+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 @@
+-
+-
+-
+-
+-
+-
+- DejaVu Sans
+-
+-
+- 7.5
+-
+-
+- false
+-
+-
+-
+-
+- DejaVu Sans Mono
+-
+-
+- 7.5
+-
+-
+- false
+-
+-
+-
+-
+- DejaVu Serif
+-
+-
+- 7.5
+-
+-
+- false
+-
+-
+-
+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 @@
+-
+-
+-
+-
+-
+-
+- DejaVu Sans Condensed
+-
+-
+- 7.5
+-
+-
+- false
+-
+-
+-
+-
+- DejaVu Sans Mono Condensed
+-
+-
+- 7.5
+-
+-
+- false
+-
+-
+-
+-
+- DejaVu Serif Condensed
+-
+-
+- 7.5
+-
+-
+- false
+-
+-
+-
+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 @@
+-
+-
+-
+-
+-
+-
+- DejaVu LGC Sans
+-
+-
+- 7.5
+-
+-
+- false
+-
+-
+-
+-
+- DejaVu LGC Sans Condensed
+-
+-
+- 7.5
+-
+-
+- false
+-
+-
+-
+-
+- DejaVu LGC Sans Mono
+-
+-
+- 7.5
+-
+-
+- false
+-
+-
+-
+-
+- DejaVu LGC Serif
+-
+-
+- 7.5
+-
+-
+- false
+-
+-
+-
+-
+- DejaVu LGC Serif Condensed
+-
+-
+- 7.5
+-
+-
+- false
+-
+-
+-
+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 @@
++
++
++
++
++
++
++ DejaVu LGC Sans
++
++
++ 7.5
++
++
++ false
++
++
++
+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 @@
++
++
++
++
++
++
++ DejaVu LGC Sans Mono
++
++
++ 7.5
++
++
++ false
++
++
++
+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 @@
++
++
++
++
++
++
++ DejaVu LGC Serif
++
++
++ 7.5
++
++
++ false
++
++
++
+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 @@
++
++
++
++
++
++
++ DejaVu Sans
++
++
++ 7.5
++
++
++ false
++
++
++
+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 @@
++
++
++
++
++
++
++ DejaVu Sans Mono
++
++
++ 7.5
++
++
++ false
++
++
++
+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 @@
++
++
++
++
++
++
++ DejaVu Serif
++
++
++ 7.5
++
++
++ false
++
++
++
+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 @@
+-
+-
+-
+-
+-
+-
+- Arev Sans
+-
+- DejaVu Sans
+-
+-
+-
+- Bepa
+-
+- DejaVu Sans
+-
+-
+-
+- Bitstream Prima Sans
+-
+- DejaVu Sans
+-
+-
+-
+- Bitstream Vera Sans
+-
+- DejaVu Sans
+-
+-
+-
+- DejaVu LGC Sans
+-
+- DejaVu Sans
+-
+-
+-
+- Hunky Sans
+-
+- DejaVu Sans
+-
+-
+-
+- Olwen Sans
+-
+- DejaVu Sans
+-
+-
+-
+- SUSE Sans
+-
+- DejaVu Sans
+-
+-
+-
+- Verajja
+-
+- DejaVu Sans
+-
+-
+-
+-
+- VerajjaPDA
+-
+- DejaVu Sans
+-
+-
+-
+- Bepa Mono
+-
+- DejaVu Sans Mono
+-
+-
+-
+- Bitstream Prima Sans Mono
+-
+- DejaVu Sans Mono
+-
+-
+-
+- Bitstream Vera Sans Mono
+-
+- DejaVu Sans Mono
+-
+-
+-
+- DejaVu LGC Sans Mono
+-
+- DejaVu Sans Mono
+-
+-
+-
+- Olwen Sans Mono
+-
+- DejaVu Sans Mono
+-
+-
+-
+- SUSE Sans Mono
+-
+- DejaVu Sans Mono
+-
+-
+-
+- Bitstream Prima Serif
+-
+- DejaVu Serif
+-
+-
+-
+- Bitstream Vera Serif
+-
+- DejaVu Serif
+-
+-
+-
+- DejaVu LGC Serif
+-
+- DejaVu Serif
+-
+-
+-
+- Hunky Serif
+-
+- DejaVu Serif
+-
+-
+-
+- Olwen Serif
+-
+- DejaVu Serif
+-
+-
+-
+- SUSE Serif
+-
+- DejaVu Serif
+-
+-
+-
+-
+- Verajja Serif
+-
+- DejaVu Serif
+-
+-
+-
+-
+- DejaVu Sans Mono
+-
+- monospace
+-
+-
+-
+- DejaVu Sans
+-
+- sans-serif
+-
+-
+-
+- DejaVu Serif
+-
+- serif
+-
+-
+-
+-
+- monospace
+-
+- DejaVu Sans Mono
+-
+-
+-
+- sans-serif
+-
+- DejaVu Sans
+-
+-
+-
+- serif
+-
+- DejaVu Serif
+-
+-
+-
+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 @@
++
++
++
++
++
++
++ Arev Sans
++
++ DejaVu Sans
++
++
++
++ Bepa
++
++ DejaVu Sans
++
++
++
++ Bitstream Prima Sans
++
++ DejaVu Sans
++
++
++
++ Bitstream Vera Sans
++
++ DejaVu Sans
++
++
++
++ DejaVu LGC Sans
++
++ DejaVu Sans
++
++
++
++ Hunky Sans
++
++ DejaVu Sans
++
++
++
++ Olwen Sans
++
++ DejaVu Sans
++
++
++
++ SUSE Sans
++
++ DejaVu Sans
++
++
++
++ Verajja
++
++ DejaVu Sans
++
++
++
++
++ VerajjaPDA
++
++ DejaVu Sans
++
++
++
++
++ DejaVu Sans
++
++ sans-serif
++
++
++
++
++ sans-serif
++
++ DejaVu Sans
++
++
++
+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 @@
++
++
++
++
++
++
++ Bepa Mono
++
++ DejaVu Sans Mono
++
++
++
++ Bitstream Prima Sans Mono
++
++ DejaVu Sans Mono
++
++
++
++ Bitstream Vera Sans Mono
++
++ DejaVu Sans Mono
++
++
++
++ DejaVu LGC Sans Mono
++
++ DejaVu Sans Mono
++
++
++
++ Olwen Sans Mono
++
++ DejaVu Sans Mono
++
++
++
++ SUSE Sans Mono
++
++ DejaVu Sans Mono
++
++
++
++
++ DejaVu Sans Mono
++
++ monospace
++
++
++
++
++ monospace
++
++ DejaVu Sans Mono
++
++
++
+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 @@
++
++
++
++
++
++
++ Bitstream Prima Serif
++
++ DejaVu Serif
++
++
++
++ Bitstream Vera Serif
++
++ DejaVu Serif
++
++
++
++ DejaVu LGC Serif
++
++ DejaVu Serif
++
++
++
++ Hunky Serif
++
++ DejaVu Serif
++
++
++
++ Olwen Serif
++
++ DejaVu Serif
++
++
++
++ SUSE Serif
++
++ DejaVu Serif
++
++
++
++
++ Verajja Serif
++
++ DejaVu Serif
++
++
++
++
++ DejaVu Serif
++
++ serif
++
++
++
++
++ serif
++
++ DejaVu Serif
++
++
++
+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 @@
+-
+-
+-
+-
+-
+-
+- Arev Sans
+-
+- DejaVu LGC Sans
+-
+-
+-
+- Bepa
+-
+- DejaVu LGC Sans
+-
+-
+-
+- Bitstream Prima Sans
+-
+- DejaVu LGC Sans
+-
+-
+-
+- Bitstream Vera Sans
+-
+- DejaVu LGC Sans
+-
+-
+-
+- DejaVu Sans
+-
+- DejaVu LGC Sans
+-
+-
+-
+- Hunky Sans
+-
+- DejaVu LGC Sans
+-
+-
+-
+- Olwen Sans
+-
+- DejaVu LGC Sans
+-
+-
+-
+- SUSE Sans
+-
+- DejaVu LGC Sans
+-
+-
+-
+- Verajja
+-
+- DejaVu LGC Sans
+-
+-
+-
+-
+- VerajjaPDA
+-
+- DejaVu LGC Sans
+-
+-
+-
+- DejaVu Sans Condensed
+-
+- DejaVu LGC Sans Condensed
+-
+-
+-
+- Toga Sans
+-
+- DejaVu LGC Sans Condensed
+-
+-
+-
+- Bepa Mono
+-
+- DejaVu LGC Sans Mono
+-
+-
+-
+- Bitstream Prima Sans Mono
+-
+- DejaVu LGC Sans Mono
+-
+-
+-
+- Bitstream Vera Sans Mono
+-
+- DejaVu LGC Sans Mono
+-
+-
+-
+- DejaVu Sans Mono
+-
+- DejaVu LGC Sans Mono
+-
+-
+-
+- Olwen Sans Mono
+-
+- DejaVu LGC Sans Mono
+-
+-
+-
+- SUSE Sans Mono
+-
+- DejaVu LGC Sans Mono
+-
+-
+-
+- Bitstream Prima Serif
+-
+- DejaVu LGC Serif
+-
+-
+-
+- Bitstream Vera Serif
+-
+- DejaVu LGC Serif
+-
+-
+-
+- DejaVu Serif
+-
+- DejaVu LGC Serif
+-
+-
+-
+- Hunky Serif
+-
+- DejaVu LGC Serif
+-
+-
+-
+- Olwen Serif
+-
+- DejaVu LGC Serif
+-
+-
+-
+- SUSE Serif
+-
+- DejaVu LGC Serif
+-
+-
+-
+-
+- Verajja Serif
+-
+- DejaVu LGC Serif
+-
+-
+-
+- DejaVu Serif Condensed
+-
+- DejaVu LGC Serif Condensed
+-
+-
+-
+- Toga Serif
+-
+- DejaVu LGC Serif Condensed
+-
+-
+-
+-
+- DejaVu LGC Sans Mono
+-
+- monospace
+-
+-
+-
+- DejaVu LGC Sans
+- DejaVu LGC Sans Condensed
+-
+- sans-serif
+-
+-
+-
+- DejaVu LGC Serif
+- DejaVu LGC Serif Condensed
+-
+- serif
+-
+-
+-
+-
+- monospace
+-
+- DejaVu LGC Sans Mono
+-
+-
+-
+- sans-serif
+-
+- DejaVu LGC Sans
+-
+-
+-
+- serif
+-
+- DejaVu LGC Serif
+-
+-
+-
+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 @@
++
++
++
++
++
++
++ Arev Sans
++
++ DejaVu LGC Sans
++
++
++
++ Bepa
++
++ DejaVu LGC Sans
++
++
++
++ Bitstream Prima Sans
++
++ DejaVu LGC Sans
++
++
++
++ Bitstream Vera Sans
++
++ DejaVu LGC Sans
++
++
++
++ DejaVu Sans
++
++ DejaVu LGC Sans
++
++
++
++ Hunky Sans
++
++ DejaVu LGC Sans
++
++
++
++ Olwen Sans
++
++ DejaVu LGC Sans
++
++
++
++ SUSE Sans
++
++ DejaVu LGC Sans
++
++
++
++ Verajja
++
++ DejaVu LGC Sans
++
++
++
++
++ VerajjaPDA
++
++ DejaVu LGC Sans
++
++
++
++
++ DejaVu LGC Sans
++
++ sans-serif
++
++
++
++
++ sans-serif
++
++ DejaVu LGC Sans
++
++
++
+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 @@
++
++
++
++
++
++
++ Bepa Mono
++
++ DejaVu LGC Sans Mono
++
++
++
++ Bitstream Prima Sans Mono
++
++ DejaVu LGC Sans Mono
++
++
++
++ Bitstream Vera Sans Mono
++
++ DejaVu LGC Sans Mono
++
++
++
++ DejaVu Sans Mono
++
++ DejaVu LGC Sans Mono
++
++
++
++ Olwen Sans Mono
++
++ DejaVu LGC Sans Mono
++
++
++
++ SUSE Sans Mono
++
++ DejaVu LGC Sans Mono
++
++
++
++
++ DejaVu LGC Sans Mono
++
++ monospace
++
++
++
++
++ monospace
++
++ DejaVu LGC Sans Mono
++
++
++
+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 @@
++
++
++
++
++
++
++ Bitstream Prima Serif
++
++ DejaVu LGC Serif
++
++
++
++ Bitstream Vera Serif
++
++ DejaVu LGC Serif
++
++
++
++ DejaVu Serif
++
++ DejaVu LGC Serif
++
++
++
++ Hunky Serif
++
++ DejaVu LGC Serif
++
++
++
++ Olwen Serif
++
++ DejaVu LGC Serif
++
++
++
++ SUSE Serif
++
++ DejaVu LGC Serif
++
++
++
++
++ Verajja Serif
++
++ DejaVu LGC Serif
++
++
++
++
++ DejaVu LGC Serif
++
++ serif
++
++
++
++
++ serif
++
++ DejaVu LGC Serif
++
++
++
+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 @@
+-
+-
+-
+-
+-
+-
+- DejaVu LGC Sans Condensed
+-
+- DejaVu Sans Condensed
+-
+-
+-
+- Toga Sans
+-
+- DejaVu Sans Condensed
+-
+-
+-
+- DejaVu LGC Serif Condensed
+-
+- DejaVu Serif Condensed
+-
+-
+-
+- Toga Serif
+-
+- DejaVu Serif Condensed
+-
+-
+-
+-
+- sans-serif
+-
+- DejaVu Sans Condensed
+-
+-
+-
+- serif
+-
+- DejaVu Serif Condensed
+-
+-
+-
diff --git a/dejavu-fonts.spec b/dejavu-fonts.spec
index 05fb11a..04e1987 100644
--- a/dejavu-fonts.spec
+++ b/dejavu-fonts.spec
@@ -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,53 +71,141 @@ BuildRequires: %{Blocks} %{UnicodeData}
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.
-
-This package includes the typefaces the DejaVu project considers mature.
+%common_desc
-%package experimental
+%package doc
+Summary: DejaVu fonts, documentation
Group: User Interface/X
-Summary: DejaVu fonts, experimental typefaces
-# Does not really make sense without the core typefaces
-Requires: %{name} = %{version}-%{release}
+
+%description doc
+%common_desc
+
+This package consists of the DejaVu project documentation.
-%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.
-
-This package includes the typefaces the DejaVu project considers experimental.
-
-
-%package -n %{fontname}-lgc-fonts
+%package compat
+Summary: DejaVu fonts, 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-fonts < 2.6.23
+Obsoletes: dejavu-fonts-experimental < 2.6.23
+
+Requires: %{name}-sans, %{name}-serif, %{name}-sans-mono
+
+%description compat
+%compat_desc
-%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.
+%package lgc-compat
+Summary: DejaVu fonts, LGC compatibility
+Group: User Interface/X
-This package includes a subset of DejaVu typefaces limited to Latin, Greek and
-Cyrillic glyphs.
+Obsoletes: dejavu-lgc-fonts < 2.6.23
+
+Requires: %{name}-lgc-sans, %{name}-lgc-serif, %{name}-lgc-sans-mono
+
+%description lgc-compat
+%compat_desc
+
+
+%package sans
+Summary: DejaVu, variable-width sans-serif font faces
+Group: User Interface/X
+Requires: %{name}-doc = %{version}-%{release}
+
+%description sans
+%common_desc
+
+This package consists of the DejaVu sans-serif variable-width font faces, in
+their unabridged version.
+
+%font_subpkg -n sans -f *-%{fontname}-sans.conf DejaVuSans.ttf DejaVuSans-*.ttf DejaVuSansCondensed*.ttf
+
+
+%package serif
+Summary: DejaVu, variable-width serif font faces
+Group: User Interface/X
+Requires: %{name}-doc = %{version}-%{release}
+
+%description serif
+%common_desc
+
+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
+
+
+%package sans-mono
+Summary: DejaVu, monospace sans-serif font faces
+Group: User Interface/X
+Requires: %{name}-doc = %{version}-%{release}
+
+%description sans-mono
+%common_desc
+
+This package consists of the DejaVu sans-serif monospace font faces, in their
+unabridged version.
+
+%font_subpkg -n sans-mono -f *-%{fontname}-sans-mono.conf DejaVuSansMono*.ttf
+
+
+%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
+
+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
+
+
+%package lgc-serif
+Summary: DejaVu, variable-width serif font faces, Latin-Greek-Cyrillic subset
+Group: User Interface/X
+Requires: %{name}-doc = %{version}-%{release}
+
+%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.
+
+%font_subpkg -n lgc-serif -f *-%{fontname}-lgc-serif.conf DejaVuLGCSerif.ttf DejaVuLGCSerif-*.ttf DejaVuLGCSerifCondensed*.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
+
+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
@@ -97,85 +223,23 @@ install -m 0644 -p fontconfig/*conf %{buildroot}%{fontconfdir}
%clean
rm -fr %{buildroot}
-
-%post
-if [ -x %{_bindir}/fc-cache ] ; then
- %{_bindir}/fc-cache %{fontdir} || :
-fi
-
-
-%postun
-if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then
- %{_bindir}/fc-cache %{fontdir} || :
-fi
-
-
-%post experimental
-if [ -x %{_bindir}/fc-cache ] ; then
- %{_bindir}/fc-cache %{fontdir} || :
-fi
-
-
-%postun experimental
-if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then
- %{_bindir}/fc-cache %{fontdir} || :
-fi
-
-
-%post -n %{fontname}-lgc-fonts
-if [ -x %{_bindir}/fc-cache ] ; then
- %{_bindir}/fc-cache %{fontdir} || :
-fi
-
-
-%postun -n %{fontname}-lgc-fonts
-if [ -x %{_bindir}/fc-cache ] ; then
- %{_bindir}/fc-cache %{fontdir} || :
-fi
-
-
-%files
+%files doc
%defattr(0644,root,root,0755)
%doc AUTHORS BUGS LICENSE NEWS README
-%doc build/unicover.txt build/langcover.txt build/status.txt
-
-%config(noreplace) %{fontconfdir}/20-unhint-small-%{fontname}.conf
-%config(noreplace) %{fontconfdir}/57-%{fontname}.conf
+%doc build/unicover.txt build/status.txt.bz2
+# May as well put it in the common doc package
%dir %{fontdir}/
-%{fontdir}/*.ttf
-%exclude %{fontdir}/DejaVu*Condensed*.ttf
-%exclude %{fontdir}/DejaVu*ExtraLight*.ttf
-%exclude %{fontdir}/DejaVuSerif*Italic.ttf
-%exclude %{fontdir}/DejaVuLGC*.ttf
-
-
-%files experimental
-%defattr(0644,root,root,0755)
-
-%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
-
-%exclude %{fontdir}/DejaVuLGC*.ttf
-
-
-%files -n %{fontname}-lgc-fonts
-%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
-
-%dir %{fontdir}/
-%{fontdir}/DejaVuLGC*.ttf
%changelog
+* Sat Nov 8 2008 Nicolas Mailhot
+- 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
- 2.26-2
⚙ Rebuild with pre-F10-freeze fontforge
diff --git a/import.log b/import.log
index 9524e01..7e838db 100644
--- a/import.log
+++ b/import.log
@@ -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