rpms/dejavu-fonts/FC-4 .cvsignore, 1.7, 1.8 dejavu-fonts.spec, 1.6, 1.7 sources, 1.7, 1.8

[Nicolas Mailhot (nim)]

Author: nim

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

Modified Files:
	.cvsignore dejavu-fonts.spec sources 
Log Message:
auto-import dejavu-fonts-2.2-1.fc4 on branch FC-4 from dejavu-fonts-2.2-1.fc4.src.rpm
2.2 + fontconfig changes


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	28 Dec 2005 20:43:55 -0000	1.7
+++ .cvsignore	16 Jan 2006 06:35:38 -0000	1.8
@@ -1 +1 @@
-dejavu-ttf-2.1.tar.gz
+dejavu-ttf-2.2.tar.gz


Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-4/dejavu-fonts.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dejavu-fonts.spec	28 Dec 2005 20:43:55 -0000	1.6
+++ dejavu-fonts.spec	16 Jan 2006 06:35:38 -0000	1.7
@@ -2,7 +2,7 @@
 %define fontdir         %{_datadir}/fonts/dejavu
 
 Name:      dejavu-fonts
-Version:   2.1
+Version:   2.2
 Release:   1%{?dist}
 Summary:   DejaVu Fonts
 Group:     User Interface/X
@@ -11,6 +11,7 @@
 Source:    http://prdownloads.sourceforge.net/dejavu/%{archivename}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
+Conflicts: fontconfig > = 2.3.93
 
 %description
 The DejaVu fonts are a font family based on the Bitstream Vera Fonts release
@@ -63,6 +64,10 @@
 %ghost %{fontdir}/fonts.cache-2
 
 %changelog
+* Mon Jan 16 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> 2.2-1
+- 2.2
+- Conflict on newer fontconfig (yes you have to use the FC5 rpm with this one)
+
 * Wed Dec 28 2005 Nicolas Mailhot <nicolas.mailhot at laposte.net> 2.1-1
 - 2.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	28 Dec 2005 20:43:55 -0000	1.7
+++ sources	16 Jan 2006 06:35:38 -0000	1.8
@@ -1 +1 @@
-3cfda3005e611319ee12d8d418976595  dejavu-ttf-2.1.tar.gz
+cfd45d17c2bffc761997cfcb00040e1f  dejavu-ttf-2.2.tar.gz