rpms/dejavu-fonts/devel .cvsignore, 1.16, 1.17 dejavu-fonts.spec, 1.33, 1.34 sources, 1.16, 1.17
Nicolas Mailhot (nim)
fedora-extras-commits at redhat.com
Sun Jun 18 10:21:33 UTC 2006
Author: nim
Update of /cvs/extras/rpms/dejavu-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21714/devel
Modified Files:
.cvsignore dejavu-fonts.spec sources
Log Message:
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
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore 14 Jun 2006 21:13:20 -0000 1.16
+++ .cvsignore 18 Jun 2006 10:21:33 -0000 1.17
@@ -1 +1 @@
-dejavu-sfd-20060614-943.tar.gz
+dejavu-sfd-20060618-945.tar.gz
Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- dejavu-fonts.spec 16 Jun 2006 21:18:05 -0000 1.33
+++ dejavu-fonts.spec 18 Jun 2006 10:21:33 -0000 1.34
@@ -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 @@
%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 @@
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 @@
%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
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources 14 Jun 2006 21:13:20 -0000 1.16
+++ sources 18 Jun 2006 10:21:33 -0000 1.17
@@ -1 +1 @@
-752534f586811b0ffae8c8b2d36acba5 dejavu-sfd-20060614-943.tar.gz
+620c8efb696486e0bdc55706ed3ceaf0 dejavu-sfd-20060618-945.tar.gz
More information about the fedora-extras-commits
mailing list