diff --git a/.cvsignore b/.cvsignore
index 6358e13..8a43bc3 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-dejavu-sfd-2.10.tar.gz
+dejavu-sfd-2.11.tar.gz
diff --git a/dejavu-fonts-condensed-fontconfig.conf b/dejavu-fonts-condensed-fontconfig.conf
deleted file mode 100644
index f477de4..0000000
--- a/dejavu-fonts-condensed-fontconfig.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
- DejaVu Sans Condensed
- Arial Narrow
- DejaVu LGC Sans Condensed
- Nimbus Sans L Condensed
- DejaVu Serif Condensed
- DejaVu LGC Serif Condensed
-
- condensed
-
-
-
diff --git a/dejavu-fonts-experimental-fontconfig.conf b/dejavu-fonts-experimental-fontconfig.conf
index ea05676..37b5dd1 100644
--- a/dejavu-fonts-experimental-fontconfig.conf
+++ b/dejavu-fonts-experimental-fontconfig.conf
@@ -1,6 +1,6 @@
-
- DejaVu Sans Condensed
-
- condensed
-
-
-
- DejaVu Serif Condensed
-
- condensed
-
-
-
-
- condensed
+ sans-serif
DejaVu Sans Condensed
+
+
+
+ serif
+
DejaVu Serif Condensed
diff --git a/dejavu-fonts.spec b/dejavu-fonts.spec
index ecca2d9..0e4a386 100644
--- a/dejavu-fonts.spec
+++ b/dejavu-fonts.spec
@@ -2,7 +2,7 @@
# This macro has the same value as %{version}, except when testing pre-release snapshots
#%define alphatag 20060913svn1149
-%define archiveversion 2.10
+%define archiveversion 2.11
%define fontdir %{_datadir}/fonts/%{name}
%define fontconfdir %{_sysconfdir}/fonts
@@ -11,8 +11,8 @@
%define UnicodeData %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/UnicodeData.txt
Name: dejavu-fonts
-Version: 2.10.0
-Release: 2%{?dist}
+Version: 2.11
+Release: 1%{?dist}
Summary: DejaVu fonts
Group: User Interface/X
License: Redistributable, with restrictions
@@ -22,10 +22,8 @@ Source0: http://prdownloads.sourceforge.net/dejavu/%{archivename}-%{archiveve
Source1: %{name}-fontconfig.conf
# DejaVu fontconfig setup (experimental families)
Source2: %{name}-experimental-fontconfig.conf
-# Declare fontconfig condensed generic
-Source3: %{name}-condensed-fontconfig.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: fontforge
+BuildRequires: fontforge >= 20061019-1
# The CPAN sources do not declare perl(Font::TTF)
BuildRequires: perl-Font-TTF
# Needed to compute unicode coverage
@@ -39,6 +37,9 @@ Obsoletes: %{name}-fontconfig < 2.7.0-0.15
Obsoletes: %{name}-makedefault < 2.9.0-1
Obsoletes: %{name}-block < 2.9.0-1
+Provides: %{name}-makedefault = %{version}
+Provides: %{name}-fontconfig = %{version}
+
%description
The DejaVu fonts are a font family based on the Bitstream Vera Fonts release
@@ -95,8 +96,7 @@ install -m 0644 generated/*.ttf %{buildroot}%{fontdir}
# Fontconfig overrides for some scripts
install -d -m 0755 %{buildroot}%{fontconfdir}/conf.d
install -m 0644 %{SOURCE1} %{buildroot}%{fontconfdir}/conf.d/58-dejavu.conf
-install -m 0644 %{SOURCE2} %{buildroot}%{fontconfdir}/conf.d/58-dejavu-experimental.conf
-install -m 0644 %{SOURCE3} %{buildroot}%{fontconfdir}/conf.d/41-condensed.conf
+install -m 0644 %{SOURCE2} %{buildroot}%{fontconfdir}/conf.d/61-dejavu-experimental.conf
%clean
/bin/rm -rf %{buildroot}
@@ -146,8 +146,7 @@ fi
%files experimental
%defattr(0644,root,root,0755)
-%config %{fontconfdir}/conf.d/41-condensed.conf
-%config %{fontconfdir}/conf.d/58-dejavu-experimental.conf
+%config %{fontconfdir}/conf.d/61-dejavu-experimental.conf
%{fontdir}/DejaVu*Condensed*.ttf
%{fontdir}/DejaVu*ExtraLight*.ttf
@@ -155,6 +154,11 @@ fi
%changelog
+* Sun Oct 22 2006 Nicolas Mailhot
+- 2.11
+- forget about the "condensed" generic, based on current feedback
+- new minimal fontforge BR
+
* Sun Sep 24 2006 Nicolas Mailhot
- 2.10.0-2
- rebuild with new fontforge snapshot
diff --git a/sources b/sources
index 8401026..8c1385a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2d0c48afaba583833d90d30ff33d320a dejavu-sfd-2.10.tar.gz
+64a34c66b1dbbdaccc108bd40a101d9c dejavu-sfd-2.11.tar.gz