rpms/dejavu-fonts/FC-5 .cvsignore, 1.19, 1.20 dejavu-fonts-experimental-fontconfig.conf, 1.3, 1.4 dejavu-fonts-fontconfig.conf, 1.4, 1.5 dejavu-fonts.spec, 1.28, 1.29 sources, 1.19, 1.20

Nicolas Mailhot (nim) fedora-extras-commits at redhat.com
Sun Oct 22 18:06:59 UTC 2006


Author: nim

Update of /cvs/extras/rpms/dejavu-fonts/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30354/FC-5

Modified Files:
	.cvsignore dejavu-fonts-experimental-fontconfig.conf 
	dejavu-fonts-fontconfig.conf dejavu-fonts.spec sources 
Log Message:
auto-import dejavu-fonts-2.11-1.fc5 on branch FC-5 from dejavu-fonts-2.11-1.fc5.src.rpm
2.11


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-5/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	17 Sep 2006 13:34:39 -0000	1.19
+++ .cvsignore	22 Oct 2006 18:06:29 -0000	1.20
@@ -1 +1 @@
-dejavu-sfd-2.10.tar.gz
+dejavu-sfd-2.11.tar.gz


Index: dejavu-fonts-experimental-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-5/dejavu-fonts-experimental-fontconfig.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dejavu-fonts-experimental-fontconfig.conf	17 Sep 2006 13:34:39 -0000	1.3
+++ dejavu-fonts-experimental-fontconfig.conf	22 Oct 2006 18:06:29 -0000	1.4
@@ -1,13 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- /etc/fonts/conf.d/58-dejavu-experimental.conf
+<!-- /etc/fonts/conf.d/61-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 -->
@@ -45,16 +43,16 @@
   </match>
 <!-- Assign generic name -->
   <alias>
-    <family>DejaVu Sans Condensed</family>
-    <default>
-      <family>sans-serif</family>
-    </default>
+    <family>sans-serif</family>
+    <prefer>
+      <family>DejaVu Sans Condensed</family>
+    </prefer>
   </alias>
   <alias>
-    <family>DejaVu Serif Condensed</family>
-    <default>
-      <family>serif</family>
-    </default>
+    <family>serif</family>
+    <prefer>
+      <family>DejaVu Serif Condensed</family>
+    </prefer>
   </alias>
 <!-- Turn off hinting at small sizes -->
   <match target="font">


Index: dejavu-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-5/dejavu-fonts-fontconfig.conf,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dejavu-fonts-fontconfig.conf	17 Sep 2006 13:34:39 -0000	1.4
+++ dejavu-fonts-fontconfig.conf	22 Oct 2006 18:06:29 -0000	1.5
@@ -2,11 +2,10 @@
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <!-- /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
@@ -179,30 +178,24 @@
     </default>
   </alias>
 <!-- Alias generic names -->
-  <match>
-    <test name="family">
-      <string>sans-serif</string>
-    </test>
-    <edit name="family" mode="prepend" binding="same">
-      <string>DejaVu Sans</string>
-    </edit>
-  </match>
-  <match>
-    <test name="family">
-      <string>serif</string>
-    </test>
-    <edit name="family" mode="prepend" binding="same">
-      <string>DejaVu Serif</string>
-    </edit>
-  </match>
-  <match>
-    <test name="family">
-      <string>monospace</string>
-    </test>
-    <edit name="family" mode="prepend" binding="same">
-      <string>DejaVu Sans Mono</string>
-    </edit>
-  </match>
+  <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>
 <!-- Turn off hinting at small sizes -->
   <match target="font">
     <test name="family">


Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-5/dejavu-fonts.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- dejavu-fonts.spec	17 Sep 2006 13:34:39 -0000	1.28
+++ dejavu-fonts.spec	22 Oct 2006 18:06:29 -0000	1.29
@@ -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
 %define xsldir          %{_datadir}/xml/%{name}
@@ -12,28 +12,28 @@
 %define UnicodeData     %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/UnicodeData.txt
 
 Name:      dejavu-fonts
-Version:   2.10
+Version:   2.11
 Release:   1%{?dist}
 Summary:   DejaVu fonts
 Group:     User Interface/X
 License:   Redistributable, with restrictions
 URL:       http://dejavu.sf.net/
 Source0:    http://prdownloads.sourceforge.net/dejavu/%{archivename}-%{archiveversion}.tar.gz
-# Make DejaVu fonts the default in Sans, Serif and Monospace
-Source1:   %{name}-makedefault.xsl
-#  Substitute the glyphs of another font in Sans, Serif and Monospace for Arabic and Farsi
-Source2:   %{name}-block.xsl
-Source3:   %{name}-unblock.xsl
 # DejaVu fontconfig setup
-Source4:   %{name}-fontconfig.conf
+Source1:   %{name}-fontconfig.conf
 # DejaVu fontconfig setup (experimental families)
-Source5:   %{name}-experimental-fontconfig.conf
+Source2:   %{name}-experimental-fontconfig.conf
+# Make DejaVu fonts the default in Sans, Serif and Monospace
+Source3:   %{name}-makedefault.xsl
+#  Substitute the glyphs of another font in Sans, Serif and Monospace for Arabic and Farsi
+Source4:   %{name}-block.xsl
+Source5:   %{name}-unblock.xsl
 # Substitute the glyphs of another font in DejaVu for Farsi
 Source6:   %{name}-persian-override.conf
 # Substitute the glyphs of another font in DejaVu for Arabic
 Source7:   %{name}-arabic-override.conf
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: fontforge
+BuildRequires: fontforge >= 20061019
 # The CPAN sources do not declare perl(Font::TTF)
 BuildRequires: perl-Font-TTF
 # Needed to compute unicode coverage
@@ -136,14 +136,14 @@
 
 #xsl
 install -d -m 755 %{buildroot}%{xsldir}
-install -p -m 644 %{SOURCE1} %{buildroot}%{xsldir}/makedefault.xsl
-install -p -m 644 %{SOURCE2} %{buildroot}%{xsldir}/block.xsl
-install -p -m 644 %{SOURCE3} %{buildroot}%{xsldir}/unblock.xsl
+install -p -m 644 %{SOURCE3} %{buildroot}%{xsldir}/makedefault.xsl
+install -p -m 644 %{SOURCE4} %{buildroot}%{xsldir}/block.xsl
+install -p -m 644 %{SOURCE5} %{buildroot}%{xsldir}/unblock.xsl
 
 # Fontconfig overrides for some scripts
 install -d -m 0755 %{buildroot}%{fontconfdir}/conf.d
-install -m 0644 %{SOURCE4} %{buildroot}%{fontconfdir}/conf.d/58-dejavu.conf
-install -m 0644 %{SOURCE5} %{buildroot}%{fontconfdir}/conf.d/58-dejavu-experimental.conf
+install -m 0644 %{SOURCE1} %{buildroot}%{fontconfdir}/conf.d/58-dejavu.conf
+install -m 0644 %{SOURCE2} %{buildroot}%{fontconfdir}/conf.d/61-dejavu-experimental.conf
 install -m 0644 %{SOURCE6} %{buildroot}%{fontconfdir}/conf.d/00-dejavu-persian-override.conf
 install -m 0644 %{SOURCE7} %{buildroot}%{fontconfdir}/conf.d/00-dejavu-arabic-override.conf
 
@@ -228,7 +228,7 @@
 %files experimental
 %defattr(0644,root,root,0755)
 
-%config %{fontconfdir}/conf.d/58-dejavu-experimental.conf
+%config %{fontconfdir}/conf.d/61-dejavu-experimental.conf
 
 %{fontdir}/DejaVu*Condensed*.ttf
 %{fontdir}/DejaVu*ExtraLight*.ttf
@@ -252,6 +252,10 @@
 
 
 %changelog
+* Sun Oct 22 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+- 2.11
+- new minimal fontforge BR
+
 * Sun Sep 17 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net>
 - 2.10
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-5/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	17 Sep 2006 13:34:39 -0000	1.19
+++ sources	22 Oct 2006 18:06:29 -0000	1.20
@@ -1 +1 @@
-2d0c48afaba583833d90d30ff33d320a  dejavu-sfd-2.10.tar.gz
+64a34c66b1dbbdaccc108bd40a101d9c  dejavu-sfd-2.11.tar.gz




More information about the scm-commits mailing list