diff --git a/.cvsignore b/.cvsignore index 5632148..c62b515 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -liberation-fonts-1.04.93.devel.tar.gz +liberation-fonts-1.05.1.20090630.tar.gz diff --git a/liberation-fonts.spec b/liberation-fonts.spec index f311f87..3f45d1b 100644 --- a/liberation-fonts.spec +++ b/liberation-fonts.spec @@ -9,8 +9,8 @@ New. Name: %{fontname}-fonts Summary: Fonts to replace commonly used Microsoft Windows fonts -Version: 1.04.93 -Release: 11%{?dist} +Version: 1.05.1.20090630 +Release: 1%{?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. @@ -19,11 +19,12 @@ Release: 11%{?dist} License: Liberation Group: User Interface/X URL: https://fedorahosted.org/liberation-fonts/ -Source0: liberation-fonts-1.04.93.devel.tar.gz +Source0: https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-1.05.1.20090630.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch BuildRequires: fontpackages-devel >= 1.13, xorg-x11-font-utils +BuildRequires: fontforge >= 20090224 %description %common_desc @@ -35,6 +36,8 @@ families. Summary: Shared common files of Liberation font families. Group: User Interface/X Requires: fontpackages-filesystem >= 1.13 +Obsoletes: liberation-fonts < 1.04.93-7 +Obsoletes: liberation-fonts-compat <= 1.05.1.20090630 %description -n %{fontname}-fonts-common %common_desc @@ -49,22 +52,6 @@ Shared common files of Liberation font families. %verify(not md5 size mtime) %{_fontdir}/fonts.scale %{catalogue}/%{name} -%package -n %{fontname}-fonts-compat -Summary: Compatibility files of Liberation font families. -Group: User Interface/X -Requires: %{fontname}-sans-fonts = %{version}-%{release} -Requires: %{fontname}-serif-fonts = %{version}-%{release} -Requires: %{fontname}-mono-fonts = %{version}-%{release} -Obsoletes: liberation-fonts < 1.04.93-7 - -%description -n %{fontname}-fonts-compat -%common_desc - -Meta-package for installing all three font families: Sans, Serif, Mono. - -%files -n %{fontname}-fonts-compat -%{nil} - %package -n %{fontname}-sans-fonts Summary: Sans-serif fonts to replace commonly used Microsoft Arial Group: User Interface/X @@ -104,16 +91,16 @@ New. %_font_pkg -n mono LiberationMono-*.ttf %prep -%setup -q -n %{name}-%{version}.devel +%setup -q -n %{name}-%{version} %build -%{nil} +%__make build %install rm -rf %{buildroot} # fonts .ttf install -m 0755 -d %{buildroot}%{_fontdir} -install -m 0644 -p *.ttf %{buildroot}%{_fontdir} +install -m 0644 -p ttf/*.ttf %{buildroot}%{_fontdir} # catalogue install -m 0755 -d %{buildroot}%{catalogue} ln -sf %{_fontdir} %{buildroot}%{catalogue}/%{name} diff --git a/sources b/sources index 78048d8..90ce640 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -01e9083d6e55f83ae9344521f8a9739a liberation-fonts-1.04.93.devel.tar.gz +ea3af6af7ee0a54d829e545e6198dbb3 liberation-fonts-1.05.1.20090630.tar.gz