diff --git a/dejavu-fonts.spec b/dejavu-fonts.spec index e766542..3dcd933 100644 --- a/dejavu-fonts.spec +++ b/dejavu-fonts.spec @@ -53,7 +53,7 @@ fi\ Name: %{fontname}-fonts Version: 2.26 -Release: 5%{?alphatag}%{?dist} +Release: 6%{?alphatag}%{?dist} Summary: DejaVu fonts Group: User Interface/X @@ -74,14 +74,16 @@ BuildArch: noarch %common_desc -%package doc -Summary: DejaVu fonts, documentation +%package common +Summary: DejaVu fonts, common files (documentation…) Group: User Interface/X -%description doc +Obsoletes: dejavu-fonts-doc < 2.26-6 + +%description common %common_desc -This package consists of the DejaVu project documentation. +This package consists of files used by other DejaVu packages. %package compat @@ -112,7 +114,7 @@ Requires: %{name}-lgc-sans, %{name}-lgc-serif, %{name}-lgc-sans-mono %package sans Summary: DejaVu, variable-width sans-serif font faces Group: User Interface/X -Requires: %{name}-doc = %{version}-%{release} +Requires: %{name}-common = %{version}-%{release} %description sans %common_desc @@ -126,7 +128,7 @@ their unabridged version. %package serif Summary: DejaVu, variable-width serif font faces Group: User Interface/X -Requires: %{name}-doc = %{version}-%{release} +Requires: %{name}-common = %{version}-%{release} %description serif %common_desc @@ -140,7 +142,7 @@ unabridged version. %package sans-mono Summary: DejaVu, monospace sans-serif font faces Group: User Interface/X -Requires: %{name}-doc = %{version}-%{release} +Requires: %{name}-common = %{version}-%{release} %description sans-mono %common_desc @@ -154,7 +156,7 @@ unabridged version. %package lgc-sans Summary: DejaVu, variable-width sans-serif font faces, Latin-Greek-Cyrillic subset Group: User Interface/X -Requires: %{name}-doc = %{version}-%{release} +Requires: %{name}-common = %{version}-%{release} %description lgc-sans %common_desc @@ -168,7 +170,7 @@ unicode coverage restricted to Latin, Greek and Cyrillic. %package lgc-serif Summary: DejaVu, variable-width serif font faces, Latin-Greek-Cyrillic subset Group: User Interface/X -Requires: %{name}-doc = %{version}-%{release} +Requires: %{name}-common = %{version}-%{release} %description lgc-serif %common_desc @@ -182,7 +184,7 @@ unicode coverage restricted to Latin, Greek and Cyrillic. %package lgc-sans-mono Summary: DejaVu, monospace sans-serif font faces, Latin-Greek-Cyrillic subset Group: User Interface/X -Requires: %{name}-doc = %{version}-%{release} +Requires: %{name}-common = %{version}-%{release} %description lgc-sans-mono %common_desc @@ -223,12 +225,11 @@ install -m 0644 -p fontconfig/*conf %{buildroot}%{fontconfdir} %clean rm -fr %{buildroot} -%files doc +%files common %defattr(0644,root,root,0755) %doc AUTHORS BUGS LICENSE NEWS README %doc build/unicover.txt build/status.txt.bz2 -# May as well put it in the common doc package %dir %{fontdir}/ @@ -237,8 +238,8 @@ rm -fr %{buildroot} %changelog -* Sat Nov 8 2008 Nicolas Mailhot -- 2.26-5 +* Sun Nov 9 2008 Nicolas Mailhot +- 2.26-6 ⧎ Package split reorganisation, following font family lines ⵞ Create compat packages to ease switchover at F11 time (to be discontinued for F12) diff --git a/import.log b/import.log index e04ff0a..abce153 100644 --- a/import.log +++ b/import.log @@ -4,3 +4,4 @@ dejavu-fonts-2_26-2_fc10:HEAD:dejavu-fonts-2.26-2.fc10.src.rpm:1220476598 dejavu-fonts-2_26-3_fc11:HEAD:dejavu-fonts-2.26-3.fc11.src.rpm:1226169315 dejavu-fonts-2_26-4_fc11:HEAD:dejavu-fonts-2.26-4.fc11.src.rpm:1226172743 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