diff --git a/liberation-fonts.spec b/liberation-fonts.spec index 5d251b1..7a152e1 100644 --- a/liberation-fonts.spec +++ b/liberation-fonts.spec @@ -10,7 +10,7 @@ New. Name: %{fontname}-fonts Summary: Fonts to replace commonly used Microsoft Windows fonts Version: 1.04.93 -Release: 8%{?dist} +Release: 9%{?dist} # The license of the Liberation Fonts is a EULA that contains GPLv2 and two # exceptions: # The first exception is the standard FSF font exception. @@ -21,12 +21,9 @@ Group: User Interface/X URL: https://fedorahosted.org/liberation-fonts/ Source0: liberation-fonts-1.04.93.devel.tar.gz -Obsoletes: liberation-fonts-sans < 1.04.93-4 -Obsoletes: liberation-fonts-serif < 1.04.93-4 -Obsoletes: liberation-fonts-mono < 1.04.93-4 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch -Buildrequires: fontpackages-devel >= 1.13, xorg-x11-font-utils +BuildRequires: fontpackages-devel >= 1.13, xorg-x11-font-utils %description %common_desc @@ -38,8 +35,6 @@ families. Summary: Shared common files of Liberation font families. Group: User Interface/X Requires: fontpackages-filesystem >= 1.13 -Obsoletes: liberation-fonts >= 1.04.93-6 -Conflicts: liberation-fonts < 1.04.93-7 %description -n %{fontname}-fonts-common %common_desc @@ -57,10 +52,10 @@ Shared common files of Liberation font families. %package -n %{fontname}-fonts-compat Summary: Compatibility files of Liberation font families. Group: User Interface/X -Requires: %{fontname}-fonts-common = %{version}-%{release} Requires: %{fontname}-sans-fonts = %{version}-%{release} Requires: %{fontname}-serif-fonts = %{version}-%{release} Requires: %{fontname}-mono-fonts = %{version}-%{release} +Obsoletes: liberation-fonts < 1.04.93-8 %description -n %{fontname}-fonts-compat %common_desc @@ -74,6 +69,9 @@ Meta-package for installing all three font families: Sans, Serif, Mono. Summary: Sans-serif fonts to replace commonly used Microsoft Arial Group: User Interface/X Requires: %{fontname}-fonts-common = %{version}-%{release} +Conflicts: liberation-fonts < 1.04.93-8 +Obsoletes: liberation-sans-fonts < 1.04.93-8 +Provides: liberation-sans-fonts = %{version}-%{release} %description -n %{fontname}-sans-fonts %common_desc @@ -86,6 +84,9 @@ This is Sans-serif TrueType fonts that replaced commonly used Microsoft Arial. Summary: Serif fonts to replace commonly used Microsoft Times New Roman Group: User Interface/X Requires: %{fontname}-fonts-common = %{version}-%{release} +Conflicts: liberation-fonts < 1.04.93-8 +Obsoletes: liberation-serif-fonts < 1.04.93-8 +Provides: liberation-serif-fonts = %{version}-%{release} %description -n %{fontname}-serif-fonts %common_desc @@ -99,6 +100,9 @@ Roman. Summary: Monospace fonts to replace commonly used Microsoft Courier New Group: User Interface/X Requires: %{fontname}-fonts-common = %{version}-%{release} +Conflicts: liberation-fonts < 1.04.93-8 +Obsoletes: liberation-mono-fonts < 1.04.93-8 +Provides: liberation-mono-fonts = %{version}-%{release} %description -n %{fontname}-mono-fonts %common_desc @@ -130,6 +134,9 @@ mkfontscale %{buildroot}%{_fontdir} rm -rf %{buildroot} %changelog +* Thu Feb 05 2009 Caius Chance - 1.04.93-9.fc11 +- Fixed inter-subpackage dependencies with reference of dejavu. + * Wed Feb 04 2009 Caius Chance - 1.04.93-8.fc11 - Fixed inter-subpackage dependencies.