From a3e308cce24bc90f72f9cb5ba64656dd11f52f55 Mon Sep 17 00:00:00 2001 From: nim Date: Sat, 23 May 2009 13:14:43 +0000 Subject: [PATCH] clean up pre-F11 compatibility metapackage goo --- dejavu-fonts.spec | 50 +++++++++-------------------------------------- import.log | 1 + 2 files changed, 10 insertions(+), 41 deletions(-) diff --git a/dejavu-fonts.spec b/dejavu-fonts.spec index f27fcd4..216099e 100644 --- a/dejavu-fonts.spec +++ b/dejavu-fonts.spec @@ -17,18 +17,10 @@ The DejaVu font set is based on the “Bitstream Vera” fonts, release 1.10. It purpose is to provide a wider range of characters, while maintaining the \ original style, using an open collaborative development process. -# Compat description -%global compat_desc \ -This package only exists to help transition pre 2.26-3 DejaVu users to the new\ -package split. It will be removed after one distribution release cycle, please\ -do not reference it or depend on it in any way.\ -\ -It can be safely uninstalled. - Name: %{fontname}-fonts Version: 2.29 -Release: 2%{?alphatag}%{?dist} +Release: 3%{?alphatag}%{?dist} Summary: DejaVu fonts Group: User Interface/X @@ -50,38 +42,13 @@ BuildRequires: fontpackages-devel %common_desc -%package compat -Summary: DejaVu fonts compatibility package - -Obsoletes: dejavu-fonts < 2.26-3 -Obsoletes: dejavu-fonts-experimental < 2.26-3 - -Requires: %{fontname}-sans-fonts -Requires: %{fontname}-sans-mono-fonts -Requires: %{fontname}-serif-fonts - -%description compat -%compat_desc - - -%package lgc-compat -Summary: DejaVu fonts, LGC compatibility package - -Obsoletes: dejavu-lgc-fonts < 2.26-3 - -Requires: %{fontname}-lgc-sans-fonts -Requires: %{fontname}-lgc-sans-mono-fonts -Requires: %{fontname}-lgc-serif-fonts - -%description lgc-compat -%compat_desc - - %package common Summary: Common files for the Dejavu font set Requires: fontpackages-filesystem Obsoletes: dejavu-fonts-doc < 2.26-6 +Obsoletes: %{name}-compat < 2.29-3 +Obsoletes: %{name}-lgc-compat < 2.29-3 %description common %common_desc @@ -231,10 +198,6 @@ done rm -fr %{buildroot} -%files compat -%files lgc-compat - - %files common %defattr(0644,root,root,0755) %doc AUTHORS BUGS LICENSE NEWS README @@ -242,7 +205,12 @@ rm -fr %{buildroot} %changelog -* Sun Mar 15 2009 Nicolas Mailhot - 2.29-2 +* Sat May 23 2009 Nicolas Mailhot +- 1.29-3 +— remove pre-F11 compatibility metapackage + +* Sun Mar 15 2009 Nicolas Mailhot +- 2.29-2 — Make sure F11 font packages have been built with F11 fontforge * Sat Mar 14 2009 Nicolas Mailhot diff --git a/import.log b/import.log index accb06d..3f8c625 100644 --- a/import.log +++ b/import.log @@ -13,3 +13,4 @@ dejavu-fonts-2_28-4_fc11:HEAD:dejavu-fonts-2.28-4.fc11.src.rpm:1234084218 dejavu-fonts-2_28-5_fc11:HEAD:dejavu-fonts-2.28-5.fc11.src.rpm:1235377773 dejavu-fonts-2_29-1_fc11:HEAD:dejavu-fonts-2.29-1.fc11.src.rpm:1237057458 dejavu-fonts-2_29-2_fc11:HEAD:dejavu-fonts-2.29-2.fc11.src.rpm:1237143073 +dejavu-fonts-2_29-3_fc11:HEAD:dejavu-fonts-2.29-3.fc11.src.rpm:1243084445