auto-import dejavu-fonts-2.7.0-0.18.20060618svn945.fc6 on branch devel from dejavu-fonts-2.7.0-0.18.20060618svn945.fc6.src.rpm

new snapshot, clean up spec

.cvsignore

@@ -1 +1 @@
-dejavu-sfd-20060614-943.tar.gz
+dejavu-sfd-20060618-945.tar.gz

dejavu-fonts.spec

@@ -1,7 +1,7 @@
 %define archivename     dejavu-sfd
 # This macro has the same value as %{version}, except when testing pre-release snapshots
-%define alphatag	20060614svn943
-%define archiveversion  20060614-943
+%define alphatag	20060618svn945
+%define archiveversion  20060618-945
 %define fontdir         %{_datadir}/fonts/%{name}
 %define fontconfdir     %{_sysconfdir}/fonts
 %define xsldir          %{_datadir}/xml/%{name}
@@ -12,7 +12,7 @@
 
 Name:      dejavu-fonts
 Version:   2.7.0
-Release:   0.17.%{alphatag}%{?dist}
+Release:   0.18.%{alphatag}%{?dist}
 Summary:   DejaVu fonts
 Group:     User Interface/X
 License:   Redistributable, with restrictions
@@ -66,10 +66,10 @@ experimental.
 %package makedefault
 Group:     User Interface/X
 Summary:   Files needed to make DejaVu the default fontconfig fonts 
-# Needed for fontconfig alias registration
+# Needed for xslt processing of %{fontconfdir}/fonts.conf
 Requires:  %{_bindir}/xsltproc, /bin/mktemp, %{fontconfdir}/fonts.conf
-Obsoletes: %{name}-fontconfig
-Provides:  %{name}-fontconfig
+Obsoletes: %{name}-fontconfig < 2.7.0-0.15
+Conflicts: %{name}-fontconfig < 2.7.0-0.15
 
 %description makedefault
 
@@ -82,6 +82,7 @@ the aliases, and keep their current rank otherwise.
 Group:    User Interface/X
 Summary:  Files needed to block DejaVu use with some scripts
 Requires: %{fontconfdir}/conf.d
+# Needed for xslt processing of %{fontconfdir}/fonts.conf
 Requires: %{_bindir}/xsltproc, /bin/mktemp, %{fontconfdir}/fonts.conf
 
 %description block
@@ -243,6 +244,10 @@ fi
 
 
 %changelog
+* Sun Jun 18 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> - 2.7.0-0.18
+- update to 20060618-945 snapshot
+- tighten up obsoletes
+
 * Fri Jun 16 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> - 2.7.0-0.17
 - all behold the power of the alphatag
 

sources

@@ -1 +1 @@
-752534f586811b0ffae8c8b2d36acba5  dejavu-sfd-20060614-943.tar.gz
+620c8efb696486e0bdc55706ed3ceaf0  dejavu-sfd-20060618-945.tar.gz