rpms/dejavu-fonts/devel dejavu-fonts-condensed-fontconfig.conf, NONE, 1.1 dejavu-fonts-experimental-fontconfig.conf, 1.4, 1.5 dejavu-fonts-fontconfig.conf, 1.5, 1.6 dejavu-fonts.spec, 1.45, 1.46

[Nicolas Mailhot (nim)]

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32665/devel

Modified Files:
	dejavu-fonts-experimental-fontconfig.conf 
	dejavu-fonts-fontconfig.conf dejavu-fonts.spec 
Added Files:
	dejavu-fonts-condensed-fontconfig.conf 
Log Message:
auto-import dejavu-fonts-2.10.0-2.fc6 on branch devel from dejavu-fonts-2.10.0-2.fc6.src.rpm
new fontforge + condensed generic


--- NEW FILE dejavu-fonts-condensed-fontconfig.conf ---
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<!-- /etc/fonts/conf.d/41-condensed.conf

     Create a condensed generic

     © 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net>
-->
  <alias>
    <family>DejaVu Sans Condensed</family>
    <family>Arial Narrow</family>
    <family>DejaVu LGC Sans Condensed</family>
    <family>Nimbus Sans L Condensed</family>
    <family>DejaVu Serif Condensed</family>
    <family>DejaVu LGC Serif Condensed</family>
    <default>
      <family>condensed</family>
    </default>
  </alias>
</fontconfig>


Index: dejavu-fonts-experimental-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts-experimental-fontconfig.conf,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dejavu-fonts-experimental-fontconfig.conf	15 Sep 2006 18:27:37 -0000	1.4
+++ dejavu-fonts-experimental-fontconfig.conf	24 Sep 2006 10:44:47 -0000	1.5
@@ -1,13 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- /etc/fonts/conf.d/60-dejavu-experimental.conf
+<!-- /etc/fonts/conf.d/58-dejavu-experimental.conf
 
-     Define aliasing and other fontconfig stuff for DejaVu experimental
-     families
+     Define aliasing and other fontconfig settings for
+     DejaVu experimental families
 
      © 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net>
-
-     $Id$
 -->
 <fontconfig>
 <!-- Declare substitutes -->
@@ -47,15 +45,23 @@
   <alias>
     <family>DejaVu Sans Condensed</family>
     <default>
-      <family>sans-serif</family>
+      <family>condensed</family>
     </default>
   </alias>
   <alias>
     <family>DejaVu Serif Condensed</family>
     <default>
-      <family>serif</family>
+      <family>condensed</family>
     </default>
   </alias>
+<!-- Alias generic names -->
+  <alias>
+    <family>condensed</family>
+    <prefer>
+      <family>DejaVu Sans Condensed</family>
+      <family>DejaVu Serif Condensed</family>
+    </prefer>
+  </alias>
 <!-- Turn off hinting at small sizes -->
   <match target="font">
     <test name="family">


Index: dejavu-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts-fontconfig.conf,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dejavu-fonts-fontconfig.conf	15 Sep 2006 18:27:37 -0000	1.5
+++ dejavu-fonts-fontconfig.conf	24 Sep 2006 10:44:47 -0000	1.6
@@ -1,12 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- /etc/fonts/conf.d/60-dejavu.conf
+<!-- /etc/fonts/conf.d/58-dejavu.conf
 
-     Define aliasing and other fontconfig settings for DejaVu stable families
+     Define aliasing and other fontconfig settings for
+     DejaVu stable families
 
      © 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net>
-
-     $Id$
 -->
 <fontconfig>
 <!-- Declare DejaVu Sans a valid substitute for all known Bitstream Vera Sans


Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- dejavu-fonts.spec	17 Sep 2006 13:25:04 -0000	1.45
+++ dejavu-fonts.spec	24 Sep 2006 10:44:47 -0000	1.46
@@ -11,8 +11,8 @@
 %define UnicodeData     %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/UnicodeData.txt
 
 Name:      dejavu-fonts
-Version:   2.10
-Release:   1%{?dist}
+Version:   2.10.0
+Release:   2%{?dist}
 Summary:   DejaVu fonts
 Group:     User Interface/X
 License:   Redistributable, with restrictions
@@ -22,6 +22,8 @@
 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
 # The CPAN sources do not declare perl(Font::TTF)
@@ -94,7 +96,7 @@
 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
 
 %clean
 /bin/rm -rf %{buildroot}
@@ -144,6 +146,7 @@
 %files experimental
 %defattr(0644,root,root,0755)
 
+%config %{fontconfdir}/conf.d/41-condensed.conf
 %config %{fontconfdir}/conf.d/58-dejavu-experimental.conf
 
 %{fontdir}/DejaVu*Condensed*.ttf
@@ -152,8 +155,14 @@
 
 
 %changelog
+* Sun Sep 24 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+- 2.10.0-2
+- rebuild with new fontforge snapshot
+- create a "condensed" fontconfig generic
+- 2.10.0 > 2.10 so 2.10 is 2.10.0 again (I blame bad advice)
+
 * Sun Sep 17 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net>
-- 2.10
+- 2.10-1
 
 * Fri Sep 15 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net>
 - 2.10.0-0.2.20060913-1149