Resolves:rh#1526510 - USE_TYPO_METRICS set in Fedora 2X but not set in RHEL7 or in ttf binary release

some spec cleanups
This commit is contained in:
Parag Nemade 2017-12-20 18:14:11 +05:30
parent 5fefb11f3e
commit 06e1dbba5f
No known key found for this signature in database
GPG Key ID: 71932951EB71E972

View File

@ -12,17 +12,16 @@ New.
Name: %{fontname}-fonts
Summary: Fonts to replace commonly used Microsoft Windows fonts
Version: 1.07.4
Release: 9%{?dist}
Epoch: 1
Release: 10%{?dist}
Epoch: 1
# The license of the Liberation Fonts is a EULA that contains GPLv2 and two
# exceptions:
# The first exception is the standard FSF font exception.
# The second exception is an anti-lockdown clause somewhat like the one in
# GPLv3. This license is Free, but GPLv2 and GPLv3 incompatible.
License: Liberation
Group: User Interface/X
URL: http://fedorahosted.org/liberation-fonts/
Source0: https://fedorahosted.org/releases/l/i/liberation-fonts/%{archivename}.tar.gz
URL: http://pagure.io/liberation-fonts
Source0: https://releases.pagure.org/liberation-fonts/%{archivename}.tar.gz
Source2: %{name}-mono.conf
Source3: %{name}-sans.conf
Source4: %{name}-serif.conf
@ -36,6 +35,7 @@ BuildArch: noarch
BuildRequires: fontpackages-devel >= 1.13, xorg-x11-font-utils
BuildRequires: fontforge
BuildRequires: libappstream-glib
Requires: %{fontname}-mono-fonts = %{epoch}:%{version}-%{release}
Requires: %{fontname}-narrow-fonts = %{epoch}:%{version}-%{release}
@ -51,7 +51,6 @@ Narrow families.
%package -n %{fontname}-fonts-common
Epoch: 1
Summary: Shared common files of Liberation font families
Group: User Interface/X
Requires: fontpackages-filesystem >= 1.13
%description -n %{fontname}-fonts-common
@ -60,7 +59,8 @@ Requires: fontpackages-filesystem >= 1.13
Shared common files of Liberation font families.
%files -n %{fontname}-fonts-common
%doc AUTHORS ChangeLog COPYING License.txt README TODO
%doc AUTHORS ChangeLog README TODO
%license COPYING License.txt
%dir %{_fontdir}
%verify(not md5 size mtime) %{_fontdir}/fonts.dir
%verify(not md5 size mtime) %{_fontdir}/fonts.scale
@ -69,7 +69,6 @@ Shared common files of Liberation font families.
%package -n %{fontname}-sans-fonts
Summary: Sans-serif fonts to replace commonly used Microsoft Arial
Group: User Interface/X
Requires: %{fontname}-fonts-common = %{epoch}:%{version}-%{release}
%description -n %{fontname}-sans-fonts
@ -82,7 +81,6 @@ This is Sans-serif TrueType fonts that replaced commonly used Microsoft Arial.
%package -n %{fontname}-serif-fonts
Summary: Serif fonts to replace commonly used Microsoft Times New Roman
Group: User Interface/X
Requires: %{fontname}-fonts-common = %{epoch}:%{version}-%{release}
%description -n %{fontname}-serif-fonts
@ -96,7 +94,6 @@ Roman.
%package -n %{fontname}-mono-fonts
Summary: Monospace fonts to replace commonly used Microsoft Courier New
Group: User Interface/X
Requires: %{fontname}-fonts-common = %{epoch}:%{version}-%{release}
%description -n %{fontname}-mono-fonts
@ -110,7 +107,6 @@ New.
%package -n %{fontname}-narrow-fonts
Summary: Sans-serif Narrow fonts to replace commonly used Microsoft Arial Narrow
Group: User Interface/X
Requires: %{fontname}-fonts-common = %{epoch}:%{version}-%{release}
%description -n %{fontname}-narrow-fonts
@ -123,7 +119,11 @@ Arial Narrow.
%{_datadir}/appdata/liberation-narrow.metainfo.xml
%prep
%setup -q -n %{archivename}
%autosetup -n %{archivename}
# Fedora fix for https://bugzilla.redhat.com/show_bug.cgi?id=1526510
sed -i 's/OS2_UseTypoMetrics: 1/OS2_UseTypoMetrics: 0/g' src/*.sfd
%build
make %{?_smp_mflags}
@ -175,9 +175,16 @@ done
mkfontscale %{buildroot}%{_fontdir}
mkfontdir %{buildroot}%{_fontdir}
%check
appstream-util validate-relax --nonet \
%{buildroot}%{_datadir}/appdata/%{fontname}*.metainfo.xml
%files
%changelog
* Mon Dec 18 2017 Parag Nemade <pnemade AT fedoraproject DOT org> - 1:1.07.4-10
- Resolves:rh#1526510 - USE_TYPO_METRICS set in Fedora 2X but not set in RHEL7 or in ttf binary release
- some spec cleanups
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.07.4-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild