From 67812b888fa449df734f6171b6f3764a199f39f8 Mon Sep 17 00:00:00 2001 From: Pravin Satpute Date: Mar 02 2010 03:45:23 +0000 Subject: - updated as per merge review comments - bug 225617 --- diff --git a/bitmap-fonts.spec b/bitmap-fonts.spec index c2da53c..48dd398 100644 --- a/bitmap-fonts.spec +++ b/bitmap-fonts.spec @@ -7,8 +7,8 @@ terminals. Name: bitmap-fonts Version: 0.3 -Release: 14%{?dist} -License: Lucida +Release: 15%{?dist} +License: GPLv2 and MIT Source0: bitmap-fonts-%{version}.tar.bz2 Source1: fixfont-3.5.tar.bz2 Source2: LICENSE @@ -20,7 +20,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Group: User Interface/X Summary: Selected set of bitmap fonts -Requires: fontpackages-filesystem BuildRequires: xorg-x11-font-utils BuildRequires: fontpackages-devel @@ -68,6 +67,7 @@ License: GPLv2 %package -n bitmap-fixed-fonts Summary: Selected set of bitmap fonts Requires: fontpackages-filesystem +Obsoletes: bitmap-fonts < 0.3-14 License: GPLv2 %description -n %{fontname}-fixed-fonts @@ -80,6 +80,9 @@ License: GPLv2 cp %{SOURCE2} . +%build +%{nil} + %install rm -rf $RPM_BUILD_ROOT @@ -127,6 +130,10 @@ done rm -rf $RPM_BUILD_ROOT %changelog +* Tue Mar 02 2010 Pravin Satpute - 0.3-15 +- updated as per merge review comments +- bug 225617 + * Wed Nov 18 2009 Pravin Satpute - 0.3-14 - removed console8x8.pcf from console sub-package @@ -160,7 +167,7 @@ rm -rf $RPM_BUILD_ROOT - Rebuild for gcc4.3. * Tue Feb 27 2007 Mayank Jain - 0.3-5.1.2 -- Changed BuildRoot to %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +- Changed BuildRoot to %%{_tmppath}/%%{name}-%%{version}-%%{release}-root-%%(%%{__id_u} -n) - Changed Prereq tag to Requires(pre) - In the "cjk" subpackage summary, CJK is now spelt with capital letters. - Added %{?dist} to the Release tag