rpms/dejavu-fonts/devel .cvsignore, 1.23, 1.24 dejavu-fonts-experimental-fontconfig.conf, 1.5, 1.6 dejavu-fonts.spec, 1.46, 1.47 sources, 1.23, 1.24 dejavu-fonts-condensed-fontconfig.conf, 1.1, NONE

[Nicolas Mailhot (nim)]

Author: nim

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

Modified Files:
	.cvsignore dejavu-fonts-experimental-fontconfig.conf 
	dejavu-fonts.spec sources 
Removed Files:
	dejavu-fonts-condensed-fontconfig.conf 
Log Message:
auto-import dejavu-fonts-2.11-1.fc6 on branch devel from dejavu-fonts-2.11-1.fc6.src.rpm
2.11


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	17 Sep 2006 13:25:04 -0000	1.23
+++ .cvsignore	22 Oct 2006 17:56:48 -0000	1.24
@@ -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/devel/dejavu-fonts-experimental-fontconfig.conf,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dejavu-fonts-experimental-fontconfig.conf	24 Sep 2006 10:44:47 -0000	1.5
+++ dejavu-fonts-experimental-fontconfig.conf	22 Oct 2006 17:56:48 -0000	1.6
@@ -1,6 +1,6 @@
 <?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 settings for
      DejaVu experimental families
@@ -43,22 +43,14 @@
   </match>
 <!-- Assign generic name -->
   <alias>
-    <family>DejaVu Sans Condensed</family>
-    <default>
-      <family>condensed</family>
-    </default>
-  </alias>
-  <alias>
-    <family>DejaVu Serif Condensed</family>
-    <default>
-      <family>condensed</family>
-    </default>
+    <family>sans-serif</family>
+    <prefer>
+      <family>DejaVu Sans Condensed</family>
+    </prefer>
   </alias>
-<!-- Alias generic names -->
   <alias>
-    <family>condensed</family>
+    <family>serif</family>
     <prefer>
-      <family>DejaVu Sans Condensed</family>
       <family>DejaVu Serif Condensed</family>
     </prefer>
   </alias>


Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- dejavu-fonts.spec	24 Sep 2006 10:44:47 -0000	1.46
+++ dejavu-fonts.spec	22 Oct 2006 17:56:48 -0000	1.47
@@ -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 @@
 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}-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 @@
 # 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 @@
 %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 @@
 
 
 %changelog
+* Sun Oct 22 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+- 2.11
+- forget about the "condensed" generic, based on current feedback
+- new minimal fontforge BR
+
 * Sun Sep 24 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net>
 - 2.10.0-2
 - rebuild with new fontforge snapshot


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	17 Sep 2006 13:25:04 -0000	1.23
+++ sources	22 Oct 2006 17:56:48 -0000	1.24
@@ -1 +1 @@
-2d0c48afaba583833d90d30ff33d320a  dejavu-sfd-2.10.tar.gz
+64a34c66b1dbbdaccc108bd40a101d9c  dejavu-sfd-2.11.tar.gz


--- dejavu-fonts-condensed-fontconfig.conf DELETED ---