rpms/dejavu-fonts/devel dejavu-fonts.spec,1.23,1.24

[Nicolas Mailhot (nim)]

Author: nim

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

Modified Files:
	dejavu-fonts.spec 
Log Message:
auto-import dejavu-fonts-2.7.0-0.6.fc6 on branch devel from dejavu-fonts-2.7.0-0.6.fc6.src.rpm
2.7.0


Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- dejavu-fonts.spec	10 Jun 2006 22:34:59 -0000	1.23
+++ dejavu-fonts.spec	10 Jun 2006 22:45:29 -0000	1.24
@@ -11,7 +11,7 @@
 
 Name:      dejavu-fonts
 Version:   2.7.0
-Release:   0.5%{?dist}
+Release:   0.6%{?dist}
 Summary:   DejaVu fonts
 Group:     User Interface/X
 License:   Redistributable, with restrictions
@@ -52,15 +52,16 @@
 experimental.
 
 
-%package fontconfig
-Group:    User Interface/X
-Summary:  Files needed to register DejaVu fonts in fontconfig aliases
-Requires: %{name} = %{version}-%{release}
+%package makedefault
+Group:     User Interface/X
+Summary:   Files needed to register DejaVu fonts in fontconfig aliases
+Requires:  %{name} = %{version}-%{release}
 # Needed for fontconfig alias registration
 Requires:  %{_bindir}/xsltproc, /bin/mktemp, %{fontconfdir}/fonts.conf
+Obsoletes: %{name}-fontconfig
+Provides:  %{name}-fontconfig
 
-
-%description fontconfig
+%description makedefault
 
 This package will add DejaVu fonts to fontconfig aliases and keep them there.
 It will make DejaVu fonts the first choice if they're not already listed in
@@ -161,7 +162,7 @@
 ### Triggers yes I know I'm mad
 
 # I hope this won't be necessary by FC6T1 time
-%triggerin fontconfig -- fontconfig, %{fontconfdir}/fonts.conf
+%triggerin makedefault -- fontconfig, %{fontconfdir}/fonts.conf
 if [ -w %{fontconfdir}/fonts.conf ] ; then
   TMPFILE=$(/bin/mktemp -q /tmp/fonts.conf.XXXXXX) && \
   %{_bindir}/xsltproc --novalid --output $TMPFILE \
@@ -187,7 +188,7 @@
 %{fontdir}/DejaVuSerif-*Oblique.ttf
 
 
-%files fontconfig
+%files makedefault
 %defattr(0644,root,root,0755)
 %dir %{xsldir}
 %{xsldir}/%{name}-register.xsl
@@ -199,11 +200,12 @@
 
 
 %changelog
-* Thu Jun 09 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> - 2.7.0-0.1
+* Sun Jun 11 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> - 2.7.0-0.6
 - preparation to 2.7.0 based on the current dejavu snapshot
 - addition of fontconfig blocking for Arabic and Persian
+  (experimental but safe)
 - tweak of the fontconfig aliasing to make DejaVu fonts the highest prio
-  instead of following Vera ranking
+  instead of following Vera ranking, and rename the subpackage accordingly
 
 * Mon May 15 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> - 2.6.0-1
 - 2.6.0