rpms/dejavu-fonts/FC-4 dejavu-fonts.spec,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-serv3626/FC-4

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


Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-4/dejavu-fonts.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- dejavu-fonts.spec	16 Jan 2006 06:35:38 -0000	1.7
+++ dejavu-fonts.spec	16 Jan 2006 18:46:04 -0000	1.8
@@ -3,7 +3,7 @@
 
 Name:      dejavu-fonts
 Version:   2.2
-Release:   1%{?dist}
+Release:   2%{?dist}
 Summary:   DejaVu Fonts
 Group:     User Interface/X
 License:   Redistributable, with restrictions
@@ -11,7 +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
+Conflicts: fontconfig > = 2.3.0
 
 %description
 The DejaVu fonts are a font family based on the Bitstream Vera Fonts release
@@ -34,7 +34,6 @@
 # "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}
@@ -61,9 +60,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-2
+- Seems FC-4 and FC-3 have the same needs after all
+
 * 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)