diff --git a/SPECS/liberation-fonts.spec b/SPECS/liberation-fonts.spec
index 3b209d2..b11c7d2 100644
--- a/SPECS/liberation-fonts.spec
+++ b/SPECS/liberation-fonts.spec
@@ -2,21 +2,19 @@
%global fontname liberation
%global fontconf %{priority}-%{fontname}
%global archivename %{name}-%{version}
-%global common_desc \
-The Liberation Fonts are intended to be replacements for the three most \
-commonly used fonts on Microsoft systems: Times New Roman, Arial, and Courier \
-New.
+%global common_desc The Liberation Fonts are intended to be replacements for the 3 most commonly\
+used fonts on Microsoft systems: Times New Roman, Arial, and Courier New.
%define catalogue %{_sysconfdir}/X11/fontpath.d
Name: %{fontname}-fonts
Summary: Fonts to replace commonly used Microsoft Windows fonts
Version: 2.00.3
-Release: 4%{?dist}
+Release: 6%{?dist}
Epoch: 1
License: OFL
URL: https://github.com/liberationfonts/liberation-fonts
-Source0: https://github.com/liberationfonts/liberation-fonts/files/2012633/%{archivename}.tar.gz
+Source0: %{url}/files/2012633/%{archivename}.tar.gz
Source2: %{name}-mono.conf
Source3: %{name}-sans.conf
Source4: %{name}-serif.conf
@@ -39,7 +37,8 @@ Requires: %{fontname}-serif-fonts = %{epoch}:%{version}-%{release}
%description
%common_desc
-Meta-package of Liberation fonts which installs Sans, Serif, and Monospace families.
+Meta-package of Liberation fonts which installs Sans, Serif, and Monospace
+families.
%package -n %{fontname}-fonts-common
Epoch: 1
@@ -54,49 +53,62 @@ Shared common files of Liberation font families.
%files -n %{fontname}-fonts-common
%doc AUTHORS ChangeLog README TODO
%license LICENSE
-%dir %{_fontdir}
-%verify(not md5 size mtime) %{_fontdir}/fonts.dir
-%verify(not md5 size mtime) %{_fontdir}/fonts.scale
-%{catalogue}/%{name}
%{_datadir}/appdata/liberation.metainfo.xml
-%package -n %{fontname}-sans-fonts
-Summary: Sans-serif fonts to replace commonly used Microsoft Arial
-Requires: %{fontname}-fonts-common = %{epoch}:%{version}-%{release}
-
-%description -n %{fontname}-sans-fonts
-%common_desc
-
-This is Sans-serif TrueType fonts that replaced commonly used Microsoft Arial.
-
-%_font_pkg -n sans -f *-%{fontname}-sans.conf LiberationSans-*.ttf
-%{_datadir}/appdata/liberation-sans.metainfo.xml
-
-%package -n %{fontname}-serif-fonts
-Summary: Serif fonts to replace commonly used Microsoft Times New Roman
-Requires: %{fontname}-fonts-common = %{epoch}:%{version}-%{release}
-
-%description -n %{fontname}-serif-fonts
-%common_desc
-
-This is Serif TrueType fonts that replaced commonly used Microsoft Times New \
-Roman.
-
-%_font_pkg -n serif -f *-%{fontname}-serif.conf LiberationSerif*.ttf
-%{_datadir}/appdata/liberation-serif.metainfo.xml
%package -n %{fontname}-mono-fonts
Summary: Monospace fonts to replace commonly used Microsoft Courier New
Requires: %{fontname}-fonts-common = %{epoch}:%{version}-%{release}
-
%description -n %{fontname}-mono-fonts
%common_desc
-This is Monospace TrueType fonts that replaced commonly used Microsoft Courier \
-New.
+This package provides Monospace TrueType fonts that replace commonly used
+Microsoft Courier New.
-%_font_pkg -n mono -f *-%{fontname}-mono.conf LiberationMono*.ttf
+%files -n %{fontname}-mono-fonts
+%{_fontdir}-mono
+%ghost %{_fontdir}-mono/.uuid
+%{_fontconfig_templatedir}/*-liberation-mono.conf
+%config(noreplace) %{_fontconfig_confdir}/*-liberation-mono.conf
%{_datadir}/appdata/liberation-mono.metainfo.xml
+%{catalogue}/%{fontname}-mono-fonts
+
+
+%package -n %{fontname}-sans-fonts
+Summary: Sans-serif fonts to replace commonly used Microsoft Arial
+Requires: %{fontname}-fonts-common = %{epoch}:%{version}-%{release}
+%description -n %{fontname}-sans-fonts
+%common_desc
+
+This package provides Sans-serif TrueType fonts that replace commonly used
+Microsoft Arial.
+
+%files -n %{fontname}-sans-fonts
+%{_fontdir}-sans
+%ghost %{_fontdir}-sans/.uuid
+%{_fontconfig_templatedir}/*-liberation-sans.conf
+%config(noreplace) %{_fontconfig_confdir}/*-liberation-sans.conf
+%{_datadir}/appdata/liberation-sans.metainfo.xml
+%{catalogue}/%{fontname}-sans-fonts
+
+
+%package -n %{fontname}-serif-fonts
+Summary: Serif fonts to replace commonly used Microsoft Times New Roman
+Requires: %{fontname}-fonts-common = %{epoch}:%{version}-%{release}
+%description -n %{fontname}-serif-fonts
+%common_desc
+
+This package provides Serif TrueType fonts that replace commonly used
+Microsoft Times New Roman.
+
+%files -n %{fontname}-serif-fonts
+%{_fontdir}-serif
+%ghost %{_fontdir}-serif/.uuid
+%{_fontconfig_templatedir}/*-liberation-serif.conf
+%config(noreplace) %{_fontconfig_confdir}/*-liberation-serif.conf
+%{_datadir}/appdata/liberation-serif.metainfo.xml
+%{catalogue}/%{fontname}-serif-fonts
+
%prep
%autosetup -n %{archivename}
@@ -113,11 +125,20 @@ mv liberation-fonts-ttf-%{version}/* .
%install
# fonts .ttf
-install -m 0755 -d %{buildroot}%{_fontdir}
-install -m 0644 -p *.ttf %{buildroot}%{_fontdir}
+install -m 0755 -d %{buildroot}%{_fontdir}-mono
+install -m 0755 -d %{buildroot}%{_fontdir}-sans
+install -m 0755 -d %{buildroot}%{_fontdir}-serif
+
+install -m 0644 -p LiberationMono*.ttf %{buildroot}%{_fontdir}-mono
+install -m 0644 -p LiberationSans*.ttf %{buildroot}%{_fontdir}-sans
+install -m 0644 -p LiberationSerif*.ttf %{buildroot}%{_fontdir}-serif
+
+
# catalogue
install -m 0755 -d %{buildroot}%{catalogue}
-ln -s %{_fontdir} %{buildroot}%{catalogue}/%{name}
+ln -s %{_fontdir}-mono %{buildroot}%{catalogue}/%{fontname}-mono-fonts
+ln -s %{_fontdir}-sans %{buildroot}%{catalogue}/%{fontname}-sans-fonts
+ln -s %{_fontdir}-serif %{buildroot}%{catalogue}/%{fontname}-serif-fonts
install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
%{buildroot}%{_fontconfig_confdir}
@@ -148,8 +169,12 @@ for fconf in %{fontconf}-mono.conf \
done
# fonts.{dir,scale}
-mkfontscale %{buildroot}%{_fontdir}
-mkfontdir %{buildroot}%{_fontdir}
+mkfontscale %{buildroot}%{_fontdir}-mono
+mkfontscale %{buildroot}%{_fontdir}-sans
+mkfontscale %{buildroot}%{_fontdir}-serif
+mkfontdir %{buildroot}%{_fontdir}-mono
+mkfontdir %{buildroot}%{_fontdir}-sans
+mkfontdir %{buildroot}%{_fontdir}-serif
%check
appstream-util validate-relax --nonet \
@@ -157,6 +182,13 @@ appstream-util validate-relax --nonet \
%files
%changelog
+* Wed Dec 11 2019 Vishal Vijayraghavan <vvijayra@redhat.com> - 1:2.00.3-6
+- Resolves: #1664501 - liberation-fonts-common contains fonts.dir
+- Splitted the font family(mono, sans and serif) into diferrent root font directories
+
+* Mon Dec 02 2019 Vishal Vijayraghavan <vvijayra@redhat.com> - 1:2.00.3-5
+- Resolves: #1682441 - Added CI tests
+
* Wed Oct 31 2018 Vishal vijayraghavan <vishalvijayraghavan AT gmail DOT com> - 1:2.00.3-4
- Resolves: rhbz#1643920: Removed Obsoletes: %{fontname}-narrow-fonts and Provides: %{fontname}-narrow-fonts macro