rpms/dejavu-fonts/FC-4 .cvsignore, 1.14, 1.15 dejavu-fonts.spec, 1.15, 1.16 sources, 1.14, 1.15

[Nicolas Mailhot (nim)]

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22539/FC-4

Modified Files:
	.cvsignore dejavu-fonts.spec sources 
Log Message:
auto-import dejavu-fonts-2.7.0-0.20.20060618svn945.fc4 on branch FC-4 from dejavu-fonts-2.7.0-0.20.20060618svn945.fc4.src.rpm
merge changes between devel, fc5, fc4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-4/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	20 May 2006 15:29:59 -0000	1.14
+++ .cvsignore	18 Jun 2006 10:56:43 -0000	1.15
@@ -1 +1 @@
-dejavu-sfd-2.6.tar.gz
+dejavu-sfd-20060618-945.tar.gz


Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-4/dejavu-fonts.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- dejavu-fonts.spec	20 May 2006 15:29:59 -0000	1.15
+++ dejavu-fonts.spec	18 Jun 2006 10:56:43 -0000	1.16
@@ -1,15 +1,16 @@
 %define archivename     dejavu-sfd
 # This macro has the same value as %{version}, except when testing pre-release snapshots
-%define archiveversion  2.6
+%define alphatag	    20060618svn945
+%define archiveversion  20060618-945
 %define fontdir         %{_datadir}/fonts/%{name}
 
 # Let the perl Maintainer worry about Unicode.org data files (updates, licensing)
-%define Blocks         %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/Blocks.txt
-%define UnicodeData    %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/UnicodeData.txt
+%define Blocks		    %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/Blocks.txt
+%define UnicodeData	    %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/UnicodeData.txt
 
 Name:      dejavu-fonts
-Version:   2.6.0
-Release:   1%{?dist}
+Version:   2.7.0
+Release:   0.20.%{alphatag}%{?dist}
 Summary:   DejaVu fonts
 Group:     User Interface/X
 License:   Redistributable, with restrictions
@@ -26,9 +27,10 @@
 
 %description
 The DejaVu fonts are a font family based on the Bitstream Vera Fonts release
-1.10. Its purpose is to provide a wider range of characters (see Current status
-page for more information) while maintaining the original look and feel through
-the process of collaborative develop
+1.10. Its purpose is to provide a wider range of characters while maintaining
+the original look and feel through the process of collaborative development.
+
+This package includes the typefaces the DejaVu project considers mature.
 
 
 %package experimental
@@ -40,8 +42,9 @@
 
 %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.
+1.10.
+
+This package includes the typefaces the DejaVu project considers experimental.
 
 
 %prep
@@ -56,6 +59,9 @@
               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
@@ -85,6 +91,7 @@
   %{_bindir}/fc-cache %{_datadir}/fonts
 fi
 
+
 %postun
 if [ "$1" = "0" ]; then
   if [ -x %{_bindir}/fc-cache ]; then 
@@ -127,6 +134,9 @@
 
 
 %changelog
+* Sun Jun 18 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> - 2.7.0-0.20
+- merge useful devel changes
+
 * Sat May 20 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> - 2.6.0-1
 - 2.6.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-4/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	20 May 2006 15:29:59 -0000	1.14
+++ sources	18 Jun 2006 10:56:43 -0000	1.15
@@ -1 +1 @@
-aae0e562be59e57e791cd1a7273bfb8c  dejavu-sfd-2.6.tar.gz
+620c8efb696486e0bdc55706ed3ceaf0  dejavu-sfd-20060618-945.tar.gz