From 5a6f852edb913ab93b8bce7fa2aa8bc427a1c9eb Mon Sep 17 00:00:00 2001 From: nim Date: Jan 15 2009 22:54:37 +0000 Subject: update for new naming guidelines --- diff --git a/dejavu-fonts.spec b/dejavu-fonts.spec index b1b94be..6f465b6 100644 --- a/dejavu-fonts.spec +++ b/dejavu-fonts.spec @@ -28,12 +28,12 @@ It can be safely uninstalled. Name: %{fontname}-fonts Version: 2.28 -Release: 1%{?alphatag}%{?dist} +Release: 2%{?alphatag}%{?dist} Summary: DejaVu fonts Group: User Interface/X License: Bitstream Vera and Public Domain -URL: http://%{fontname}.sf.net/ +URL: http://%{name}.org/ Source0: %{?!alphatag:http://downloads.sourceforge.net/%{fontname}}%{?alphatag:%{fontname}.sourceforge.net/snapshots}/%{archivename}.tar.bz2 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -44,7 +44,7 @@ BuildRequires: perl(Font::TTF) BuildRequires: %{Blocks} %{UnicodeData} BuildArch: noarch -BuildRequires: fontpackages-devel +BuildRequires: fontpackages-devel > 1.13 %description %common_desc @@ -57,7 +57,9 @@ Group: User Interface/X Obsoletes: dejavu-fonts < 2.26-3 Obsoletes: dejavu-fonts-experimental < 2.26-3 -Requires: %{name}-sans, %{name}-serif, %{name}-sans-mono +Requires: %{fontname}-sans-fonts +Requires: %{fontname}-sans-mono-fonts +Requires: %{fontname}-serif-fonts %description compat %compat_desc @@ -69,14 +71,16 @@ Group: User Interface/X Obsoletes: dejavu-lgc-fonts < 2.26-3 -Requires: %{name}-lgc-sans, %{name}-lgc-serif, %{name}-lgc-sans-mono +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 Dejavu fonts (documentation…) +Summary: Common files for the Dejavu font set Group: User Interface/X Requires: fontpackages-filesystem @@ -88,7 +92,7 @@ Obsoletes: dejavu-fonts-doc < 2.26-6 This package consists of files used by other DejaVu packages. -%package sans +%package -n %{fontname}-sans-fonts Summary: Variable-width sans-serif font faces Group: User Interface/X Requires: %{name}-common = %{version}-%{release} @@ -96,7 +100,10 @@ Requires: %{name}-common = %{version}-%{release} Conflicts: dejavu-fonts < 2.26-3 Conflicts: dejavu-fonts-experimental < 2.26-3 -%description sans +Obsoletes: %{name}-sans < 2.28-2 +Provides: %{name}-sans = %{version}-%{release} + +%description -n %{fontname}-sans-fonts %common_desc This package consists of the DejaVu sans-serif variable-width font faces, in @@ -105,7 +112,7 @@ their unabridged version. %_font_pkg -n sans -f *-%{fontname}-sans.conf DejaVuSans.ttf DejaVuSans-*.ttf DejaVuSansCondensed*.ttf -%package serif +%package -n %{fontname}-serif-fonts Summary: Variable-width serif font faces Group: User Interface/X Requires: %{name}-common = %{version}-%{release} @@ -113,7 +120,10 @@ Requires: %{name}-common = %{version}-%{release} Conflicts: dejavu-fonts < 2.26-3 Conflicts: dejavu-fonts-experimental < 2.26-3 -%description serif +Obsoletes: %{name}-serif < 2.28-2 +Provides: %{name}-serif = %{version}-%{release} + +%description -n %{fontname}-serif-fonts %common_desc This package consists of the DejaVu serif variable-width font faces, in their @@ -122,7 +132,7 @@ unabridged version. %_font_pkg -n serif -f *-%{fontname}-serif.conf DejaVuSerif.ttf DejaVuSerif-*.ttf DejaVuSerifCondensed*.ttf -%package sans-mono +%package -n %{fontname}-sans-mono-fonts Summary: Monospace sans-serif font faces Group: User Interface/X Requires: %{name}-common = %{version}-%{release} @@ -130,7 +140,10 @@ Requires: %{name}-common = %{version}-%{release} Conflicts: dejavu-fonts < 2.26-3 Conflicts: dejavu-fonts-experimental < 2.26-3 -%description sans-mono +Obsoletes: %{name}-sans-mono < 2.28-2 +Provides: %{name}-sans-mono = %{version}-%{release} + +%description -n %{fontname}-sans-mono-fonts %common_desc This package consists of the DejaVu sans-serif monospace font faces, in their @@ -139,14 +152,16 @@ unabridged version. %_font_pkg -n sans-mono -f *-%{fontname}-sans-mono.conf DejaVuSansMono*.ttf -%package lgc-sans +%package -n %{fontname}-lgc-sans-fonts Summary: Variable-width sans-serif font faces, Latin-Greek-Cyrillic subset Group: User Interface/X Requires: %{name}-common = %{version}-%{release} Conflicts: dejavu-lgc-fonts < 2.26-3 -%description lgc-sans +Obsoletes: %{name}-lgc-sans < 2.28-2 + +%description -n %{fontname}-lgc-sans-fonts %common_desc This package consists of the DejaVu sans-serif variable-width font faces, with @@ -155,14 +170,16 @@ unicode coverage restricted to Latin, Greek and Cyrillic. %_font_pkg -n lgc-sans -f *-%{fontname}-lgc-sans.conf DejaVuLGCSans.ttf DejaVuLGCSans-*.ttf DejaVuLGCSansCondensed*.ttf -%package lgc-serif +%package -n %{fontname}-lgc-serif-fonts Summary: Variable-width serif font faces, Latin-Greek-Cyrillic subset Group: User Interface/X Requires: %{name}-common = %{version}-%{release} Conflicts: dejavu-lgc-fonts < 2.26-3 -%description lgc-serif +Obsoletes: %{name}-lgc-sans < 2.28-2 + +%description -n %{fontname}-lgc-serif-fonts %common_desc This package consists of the DejaVu serif variable-width font faces, with @@ -171,14 +188,16 @@ unicode coverage restricted to Latin, Greek and Cyrillic. %_font_pkg -n lgc-serif -f *-%{fontname}-lgc-serif.conf DejaVuLGCSerif.ttf DejaVuLGCSerif-*.ttf DejaVuLGCSerifCondensed*.ttf -%package lgc-sans-mono +%package -n %{fontname}-lgc-sans-mono-fonts Summary: Monospace sans-serif font faces, Latin-Greek-Cyrillic subset Group: User Interface/X Requires: %{name}-common = %{version}-%{release} Conflicts: dejavu-lgc-fonts < 2.26-3 -%description lgc-sans-mono +Obsoletes: %{name}-lgc-sans-mono < 2.28-2 + +%description -n %{fontname}-lgc-sans-mono-fonts %common_desc This package consists of the DejaVu sans-serif monospace font faces, with @@ -237,6 +256,12 @@ rm -fr %{buildroot} %changelog +* Thu Jan 15 2009 Nicolas Mailhot +- 2.28-2 +— Update URL +— update for new naming guidelines +– warning: provides for the old names will be dropped before F11 beta + * Sun Dec 21 2008 - 2.28-1 ❄ Update to latest release diff --git a/import.log b/import.log index 8b976e0..6e40f3d 100644 --- a/import.log +++ b/import.log @@ -7,3 +7,4 @@ dejavu-fonts-2_26-5_fc11:HEAD:dejavu-fonts-2.26-5.fc11.src.rpm:1226174018 dejavu-fonts-2_26-6_fc11:HEAD:dejavu-fonts-2.26-6.fc11.src.rpm:1226221359 dejavu-fonts-2_27-7_fc11:HEAD:dejavu-fonts-2.27-7.fc11.src.rpm:1229544635 dejavu-fonts-2_28-1_fc11:HEAD:dejavu-fonts-2.28-1.fc11.src.rpm:1229879833 +dejavu-fonts-2_28-2_fc11:HEAD:dejavu-fonts-2.28-2.fc11.src.rpm:1232060001