auto-import dejavu-fonts-2.4-1.fc6 on branch devel from dejavu-fonts-2.4-1.fc6.src.rpm

2.4 + experimental spit

.cvsignore

@@ -1 +1 @@
-dejavu-sfd-2.3-1.tar.gz
+dejavu-sfd-2.4.tar.gz

dejavu-fonts.spec

@@ -1,6 +1,6 @@
 %define archivename     dejavu-sfd
 # This macro has the same value as %{version}, except when testing pre-release snapshots
-%define archiveversion  %{version}-1
+%define archiveversion  %{version}
 %define fontdir         %{_datadir}/fonts/%{name}
 %define xsldir          %{_datadir}/xml/%{name}
 
@@ -9,9 +9,9 @@
 %define UnicodeData	%(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/UnicodeData.txt
 
 Name:      dejavu-fonts
-Version:   2.3
+Version:   2.4
-Release:   3%{?dist}
+Release:   1%{?dist}
-Summary:   DejaVu Fonts
+Summary:   DejaVu fonts
 Group:     User Interface/X
 License:   Redistributable, with restrictions
 URL:       http://dejavu.sf.net/
@@ -34,6 +34,19 @@ page for more information) while maintaining the original look and feel through
 the process of collaborative develop
 
 
+%package experimental
+Group:    User Interface/X
+Summary:  Experimental DejaVu typefaces
+# Does not really make sense without the core typefaces
+Requires: %{name} = %{version}-%{release}
+
+
+%description experimental
+The DejaVu fonts are a font family based on the Bitstream Vera Fonts release
+1.10. This package includes the typefaces the DejaVu project considers
+experimental.
+
+
 %package fontconfig
 Group:    User Interface/X
 Summary:  Files needed to register DejaVu fonts in fontconfig aliases
@@ -43,7 +56,7 @@ Requires:  %{_bindir}/xsltproc, /bin/mktemp, %{_sysconfdir}/fonts/fonts.conf
 
 
 %description fontconfig
-This package will add DejaVu fonts to fontconfig aliases
+This package will add DejaVu fonts to fontconfig aliases and keep them there.
 
 
 %prep
@@ -58,6 +71,9 @@ mv status.txt.new status.txt
               DejaVuSans.sfd Sans \
               DejaVuSerif.sfd Serif \
               DejaVuMonoSans.sfd "Sans Mono" > unicover.txt
+# We should probably also regenerate langcover.txt
+# but it requires resolution of 
+# https://bugs.freedesktop.org/show_bug.cgi?id=6316 
 
 
 %check
@@ -96,6 +112,21 @@ if [ "$1" = "0" ]; then
 fi
 
 
+%post experimental
+if [ -x %{_bindir}/fc-cache ]; then
+  %{_bindir}/fc-cache %{_datadir}/fonts
+fi
+
+
+%postun experimental
+if [ "$1" = "0" ]; then
+  if [ -x %{_bindir}/fc-cache ]; then
+    %{_bindir}/fc-cache %{_datadir}/fonts
+  fi
+fi
+
+
+# UGLY but safe and I hope won't be necessary soonish
 %triggerin fontconfig -- fontconfig, %{_sysconfdir}/fonts/fonts.conf
 
 if [ -x %{_sysconfdir}/fonts/fonts.conf ] ; then
@@ -111,7 +142,16 @@ fi
 %doc *.txt AUTHORS BUGS LICENSE NEWS README
 
 %dir %{fontdir}
-%{fontdir}/*.ttf
+%{fontdir}/DejaVu*.ttf
+%exclude %{fontdir}/DejaVu*Condensed*.ttf
+%exclude %{fontdir}/DejaVu*ExtraLight*.ttf
+%exclude %{fontdir}/DejaVuSerif-*Oblique.ttf
+
+%files experimental
+%defattr(0644,root,root,0755)
+%{fontdir}/DejaVu*Condensed*.ttf
+%{fontdir}/DejaVu*ExtraLight*.ttf
+%{fontdir}/DejaVuSerif-*Oblique.ttf
 
 
 %files fontconfig
@@ -121,6 +161,10 @@ fi
 
 
 %changelog
+* Wed Mar 22 2006  Nicolas Mailhot <nicolas.mailhot at laposte.net> - 2.4-1
+- 2.4 A big thanks to Stepan Roh for getting the project there
+- split out experimental typefaces
+
 * Sat Mar 04 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> - 2.3-3
 - split fontconfig registration in subpackage
 

sources

@@ -1 +1 @@
-b97e72f4823f93dd3c5d65481a303a5d  dejavu-sfd-2.3-1.tar.gz
+9cbf232d9b8697172aa3faa81807676b  dejavu-sfd-2.4.tar.gz