auto-import dejavu-fonts-2.2-1.fc5 on branch devel from dejavu-fonts-2.2-1.fc5.src.rpm

2.2 + fontconfig changes

.cvsignore

@@ -1 +1 @@
-dejavu-ttf-2.1.tar.gz
+dejavu-ttf-2.2.tar.gz

dejavu-fonts.spec

@@ -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 @@ URL:       http://dejavu.sf.net/
 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 @@ the process of collaborative develop
 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 @@ fi
 
 %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
 

sources

@@ -1 +1 @@
-3cfda3005e611319ee12d8d418976595  dejavu-ttf-2.1.tar.gz
+cfd45d17c2bffc761997cfcb00040e1f  dejavu-ttf-2.2.tar.gz