reverting back to liberation 1.07.2 in f19
This commit is contained in:
parent
64b0320a25
commit
dfbaabfff2
1044
liberation-fonts-bug-715309-714191-835182.patch
Normal file
1044
liberation-fonts-bug-715309-714191-835182.patch
Normal file
File diff suppressed because it is too large
Load Diff
16
liberation-fonts-narrow.conf
Normal file
16
liberation-fonts-narrow.conf
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
<?xml version="1.0"?>
|
||||||
|
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
|
||||||
|
<fontconfig>
|
||||||
|
<alias>
|
||||||
|
<family>sans-serif</family>
|
||||||
|
<prefer>
|
||||||
|
<family>Liberation Sans Narrow</family>
|
||||||
|
</prefer>
|
||||||
|
</alias>
|
||||||
|
<alias>
|
||||||
|
<family>Liberation Sans Narrow</family>
|
||||||
|
<default>
|
||||||
|
<family>sans-serif</family>
|
||||||
|
</default>
|
||||||
|
</alias>
|
||||||
|
</fontconfig>
|
@ -1,4 +1,4 @@
|
|||||||
%global priority 30-0
|
%global priority 59
|
||||||
%global fontname liberation
|
%global fontname liberation
|
||||||
%global fontconf %{priority}-%{fontname}
|
%global fontconf %{priority}-%{fontname}
|
||||||
%global archivename %{name}-%{version}
|
%global archivename %{name}-%{version}
|
||||||
@ -11,20 +11,27 @@ New.
|
|||||||
|
|
||||||
Name: %{fontname}-fonts
|
Name: %{fontname}-fonts
|
||||||
Summary: Fonts to replace commonly used Microsoft Windows fonts
|
Summary: Fonts to replace commonly used Microsoft Windows fonts
|
||||||
Version: 2.00.1
|
Version: 1.07.2
|
||||||
Release: 4%{?dist}
|
Release: 12%{?dist}
|
||||||
License: OFL
|
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
|
Group: User Interface/X
|
||||||
URL: http://fedorahosted.org/liberation-fonts/
|
URL: http://fedorahosted.org/liberation-fonts/
|
||||||
Source0: https://fedorahosted.org/releases/l/i/liberation-fonts/%{archivename}.tar.gz
|
Source0: https://fedorahosted.org/releases/l/i/liberation-fonts/%{archivename}.tar.gz
|
||||||
Source2: %{name}-mono.conf
|
Source2: %{name}-mono.conf
|
||||||
Source3: %{name}-sans.conf
|
Source3: %{name}-sans.conf
|
||||||
Source4: %{name}-serif.conf
|
Source4: %{name}-serif.conf
|
||||||
|
Source5: %{name}-narrow.conf
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
BuildRequires: fontpackages-devel >= 1.13, xorg-x11-font-utils
|
BuildRequires: fontpackages-devel >= 1.13, xorg-x11-font-utils
|
||||||
BuildRequires: fontforge
|
BuildRequires: fontforge
|
||||||
BuildRequires: python
|
|
||||||
BuildRequires: fonttools
|
BuildRequires: fonttools
|
||||||
|
Patch1: %{name}-bug-715309-714191-835182.patch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
%common_desc
|
%common_desc
|
||||||
@ -33,11 +40,10 @@ Meta-package of Liberation fonts which installs Sans, Serif, and Monospace,
|
|||||||
Narrow families.
|
Narrow families.
|
||||||
|
|
||||||
%package -n %{fontname}-fonts-common
|
%package -n %{fontname}-fonts-common
|
||||||
|
Epoch: 1
|
||||||
Summary: Shared common files of Liberation font families
|
Summary: Shared common files of Liberation font families
|
||||||
Group: User Interface/X
|
Group: User Interface/X
|
||||||
Requires: fontpackages-filesystem >= 1.13
|
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
|
%description -n %{fontname}-fonts-common
|
||||||
%common_desc
|
%common_desc
|
||||||
@ -45,7 +51,7 @@ Obsoletes: liberation-fonts-compat <= 1.05.1.20090630
|
|||||||
Shared common files of Liberation font families.
|
Shared common files of Liberation font families.
|
||||||
|
|
||||||
%files -n %{fontname}-fonts-common
|
%files -n %{fontname}-fonts-common
|
||||||
%doc AUTHORS ChangeLog LICENSE README TODO
|
%doc AUTHORS ChangeLog COPYING License.txt README TODO
|
||||||
%dir %{_fontdir}
|
%dir %{_fontdir}
|
||||||
%verify(not md5 size mtime) %{_fontdir}/fonts.dir
|
%verify(not md5 size mtime) %{_fontdir}/fonts.dir
|
||||||
%verify(not md5 size mtime) %{_fontdir}/fonts.scale
|
%verify(not md5 size mtime) %{_fontdir}/fonts.scale
|
||||||
@ -54,7 +60,7 @@ Shared common files of Liberation font families.
|
|||||||
%package -n %{fontname}-sans-fonts
|
%package -n %{fontname}-sans-fonts
|
||||||
Summary: Sans-serif fonts to replace commonly used Microsoft Arial
|
Summary: Sans-serif fonts to replace commonly used Microsoft Arial
|
||||||
Group: User Interface/X
|
Group: User Interface/X
|
||||||
Requires: %{fontname}-fonts-common = %{version}-%{release}
|
Requires: %{fontname}-fonts-common = %{epoch}:%{version}-%{release}
|
||||||
|
|
||||||
%description -n %{fontname}-sans-fonts
|
%description -n %{fontname}-sans-fonts
|
||||||
%common_desc
|
%common_desc
|
||||||
@ -66,7 +72,7 @@ This is Sans-serif TrueType fonts that replaced commonly used Microsoft Arial.
|
|||||||
%package -n %{fontname}-serif-fonts
|
%package -n %{fontname}-serif-fonts
|
||||||
Summary: Serif fonts to replace commonly used Microsoft Times New Roman
|
Summary: Serif fonts to replace commonly used Microsoft Times New Roman
|
||||||
Group: User Interface/X
|
Group: User Interface/X
|
||||||
Requires: %{fontname}-fonts-common = %{version}-%{release}
|
Requires: %{fontname}-fonts-common = %{epoch}:%{version}-%{release}
|
||||||
|
|
||||||
%description -n %{fontname}-serif-fonts
|
%description -n %{fontname}-serif-fonts
|
||||||
%common_desc
|
%common_desc
|
||||||
@ -79,7 +85,7 @@ Roman.
|
|||||||
%package -n %{fontname}-mono-fonts
|
%package -n %{fontname}-mono-fonts
|
||||||
Summary: Monospace fonts to replace commonly used Microsoft Courier New
|
Summary: Monospace fonts to replace commonly used Microsoft Courier New
|
||||||
Group: User Interface/X
|
Group: User Interface/X
|
||||||
Requires: %{fontname}-fonts-common = %{version}-%{release}
|
Requires: %{fontname}-fonts-common = %{epoch}:%{version}-%{release}
|
||||||
|
|
||||||
%description -n %{fontname}-mono-fonts
|
%description -n %{fontname}-mono-fonts
|
||||||
%common_desc
|
%common_desc
|
||||||
@ -89,8 +95,22 @@ New.
|
|||||||
|
|
||||||
%_font_pkg -n mono -f *-%{fontname}-mono.conf LiberationMono*.ttf
|
%_font_pkg -n mono -f *-%{fontname}-mono.conf LiberationMono*.ttf
|
||||||
|
|
||||||
|
%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
|
||||||
|
%common_desc
|
||||||
|
|
||||||
|
This is Sans-Serif Narrow TrueType fonts that replaced commonly used Microsoft \
|
||||||
|
Arial Narrow.
|
||||||
|
|
||||||
|
%_font_pkg -n narrow -f *-%{fontname}-narrow.conf LiberationSansNarrow*.ttf
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{archivename}
|
%setup -q -n %{archivename}
|
||||||
|
%patch1 -p1 -b .1-resolved-u-hinting-removed-kerning-for-11-pair-updated-patch-for-fix-u040D
|
||||||
|
|
||||||
%build
|
%build
|
||||||
make %{?_smp_mflags}
|
make %{?_smp_mflags}
|
||||||
@ -115,10 +135,13 @@ install -m 0644 -p %{SOURCE3} \
|
|||||||
%{buildroot}%{_fontconfig_templatedir}/%{fontconf}-sans.conf
|
%{buildroot}%{_fontconfig_templatedir}/%{fontconf}-sans.conf
|
||||||
install -m 0644 -p %{SOURCE4} \
|
install -m 0644 -p %{SOURCE4} \
|
||||||
%{buildroot}%{_fontconfig_templatedir}/%{fontconf}-serif.conf
|
%{buildroot}%{_fontconfig_templatedir}/%{fontconf}-serif.conf
|
||||||
|
install -m 0644 -p %{SOURCE5} \
|
||||||
|
%{buildroot}%{_fontconfig_templatedir}/%{fontconf}-narrow.conf
|
||||||
|
|
||||||
for fconf in %{fontconf}-mono.conf \
|
for fconf in %{fontconf}-mono.conf \
|
||||||
%{fontconf}-sans.conf \
|
%{fontconf}-sans.conf \
|
||||||
%{fontconf}-serif.conf; do
|
%{fontconf}-serif.conf \
|
||||||
|
%{fontconf}-narrow.conf; do
|
||||||
ln -s %{_fontconfig_templatedir}/$fconf \
|
ln -s %{_fontconfig_templatedir}/$fconf \
|
||||||
%{buildroot}%{_fontconfig_confdir}/$fconf
|
%{buildroot}%{_fontconfig_confdir}/$fconf
|
||||||
done
|
done
|
||||||
@ -128,7 +151,16 @@ mkfontscale %{buildroot}%{_fontdir}
|
|||||||
mkfontdir %{buildroot}%{_fontdir}
|
mkfontdir %{buildroot}%{_fontdir}
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Thu Nov 22 2012 Pravin Satpute <psatpute@redhat.com> - 2.00.1-4
|
* Tue Jan 15 2013 Pravin Satpute <psatpute@redhat.com> - 1:1.07.2-12
|
||||||
|
- Corrected font conf priority from 30-0 to 59
|
||||||
|
- building from f18 to rawhide
|
||||||
|
|
||||||
|
* Fri Dec 07 2012 Pravin Satpute <psatpute@redhat.com> - 1:1.07.2-11
|
||||||
|
- Decided to defer Liberation 2.0 feature in Fedora 18.
|
||||||
|
- Reverting to Liberation 1.07.2.
|
||||||
|
- Using 11 release to match with Liberation Sans Narrow
|
||||||
|
|
||||||
|
* Wed Nov 21 2012 Pravin Satpute <psatpute@redhat.com> - 2.00.1-4
|
||||||
- Improved spec file
|
- Improved spec file
|
||||||
|
|
||||||
* Tue Nov 20 2012 Pravin Satpute <psatpute@redhat.com> - 2.00.1-3
|
* Tue Nov 20 2012 Pravin Satpute <psatpute@redhat.com> - 2.00.1-3
|
||||||
|
Loading…
Reference in New Issue
Block a user