rpms/dejavu-fonts/devel .cvsignore, 1.7, 1.8 dejavu-fonts.spec, 1.7, 1.8 sources, 1.7, 1.8

[Nicolas Mailhot (nim)]

Author: nim

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	28 Dec 2005 20:42:02 -0000	1.7
+++ .cvsignore	16 Jan 2006 06:32:05 -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/devel/dejavu-fonts.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- dejavu-fonts.spec	28 Dec 2005 20:42:02 -0000	1.7
+++ dejavu-fonts.spec	16 Jan 2006 06:32:05 -0000	1.8
@@ -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
@@ -30,11 +31,6 @@
 install -d -m 0755 %{buildroot}%{fontdir}
 install -m 0644 *.ttf  %{buildroot}%{fontdir}
 
-# "touch" all files we've got flagged as %ghost  but which are not 
-# present in the RPM_BUILD_ROOT when RPM looks for files
-/bin/touch %{buildroot}%{fontdir}/fonts.cache-1
-/bin/touch %{buildroot}%{fontdir}/fonts.cache-2
-
 %clean
 /bin/rm -rf %{buildroot}
 
@@ -59,10 +55,11 @@
 
 %dir %{fontdir}
 %{fontdir}/*.ttf
-%ghost %{fontdir}/fonts.cache-1
-%ghost %{fontdir}/fonts.cache-2
 
 %changelog
+* Mon Jan 16 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> 2.2-1
+- 2.2
+
 * 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/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	28 Dec 2005 20:42:02 -0000	1.7
+++ sources	16 Jan 2006 06:32:05 -0000	1.8
@@ -1 +1 @@
-3cfda3005e611319ee12d8d418976595  dejavu-ttf-2.1.tar.gz
+cfd45d17c2bffc761997cfcb00040e1f  dejavu-ttf-2.2.tar.gz