diff --git a/SOURCES/julietaula-montserrat-fonts-fontconfig.conf b/SOURCES/julietaula-montserrat-fonts-fontconfig.conf
index 2332452..cc0df16 100644
--- a/SOURCES/julietaula-montserrat-fonts-fontconfig.conf
+++ b/SOURCES/julietaula-montserrat-fonts-fontconfig.conf
@@ -13,5 +13,17 @@
sans-serif
+
+ sans-serif
+
+ MontserratAlternates
+
+
+
+ MontserratAlternates
+
+ sans-serif
+
+
diff --git a/SOURCES/julietaula-montserrat.metainfo.xml b/SOURCES/julietaula-montserrat.metainfo.xml
index 202be4d..be3b5a5 100644
--- a/SOURCES/julietaula-montserrat.metainfo.xml
+++ b/SOURCES/julietaula-montserrat.metainfo.xml
@@ -11,7 +11,7 @@
The letters that inspired this project have work, dedication, care, color, contrast, light and life, day and night! These are the types that make the city look so beautiful.
- Montserrat Alternates Black
+ Montserrat Alternates Black
Montserrat Alternates Bold
Montserrat Alternates Extra Bold
Montserrat Alternates Light
diff --git a/SPECS/julietaula-montserrat-fonts.spec b/SPECS/julietaula-montserrat-fonts.spec
index b67df7a..7e41029 100644
--- a/SPECS/julietaula-montserrat-fonts.spec
+++ b/SPECS/julietaula-montserrat-fonts.spec
@@ -1,24 +1,24 @@
%global fontname julietaula-montserrat
-%global fontconf 61-%{fontname}.conf
+%global fontconf 61-%{fontname}
+%global common_desc \
+A typeface inspired by signs around the Montserrat area of Buenos Aires, Argentina
-Name: julietaula-montserrat-fonts
+Name: %{fontname}-fonts
Version: 7.200
-Release: 2%{?dist}
+Release: 2%{?dist}.2
# Override versioning to sync with upstream
Epoch: 1
-Summary: Sans-serif typeface created by Julieta Ulanovsky
+Summary: Sans-serif typeface inspired from Montserrat area
License: OFL
URL: https://github.com/JulietaUla/Montserrat
Source0: %{url}/archive/Montserrat/v%{version}.tar.gz#/Montserrat-%{version}.tar.gz
Source1: %{name}-fontconfig.conf
-Source2: %{fontname}.metainfo.xml
+Source3: %{fontname}.metainfo.xml
BuildArch: noarch
BuildRequires: fontpackages-devel
-%if 0%{?fedora} >= 21
BuildRequires: libappstream-glib
-%endif
Requires: fontpackages-filesystem
# Reset the old date based versioning
@@ -26,8 +26,12 @@ Obsoletes: %{name} < 1:%{version}-%{release}
%description
-A typeface created by Julieta Ulanovsky inspired by signs around
-the Montserrat area of Buenos Aires, Argentina
+%common_desc
+
+%_font_pkg -f %{fontconf}.conf *.otf
+%{_datadir}/metainfo/%{fontname}.metainfo.xml
+%license Montserrat-%{version}/OFL.txt
+%doc Montserrat-%{version}/README.md
%prep
%autosetup -c
@@ -36,32 +40,33 @@ the Montserrat area of Buenos Aires, Argentina
%install
-install -Dpm 0644 Montserrat-%{version}/fonts/ttf/*.ttf -t %{buildroot}%{_fontdir}
install -Dpm 0644 Montserrat-%{version}/fonts/otf/*.otf -t %{buildroot}%{_fontdir}
install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
%{buildroot}%{_fontconfig_confdir}
+# Install Montserrat fonts
install -m 0644 -p %{SOURCE1} \
- %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
-ln -s %{_fontconfig_templatedir}/%{fontconf} \
- %{buildroot}%{_fontconfig_confdir}/%{fontconf}
+ %{buildroot}%{_fontconfig_templatedir}/%{fontconf}.conf
+
+for fconf in %{fontconf}.conf ; do
+ ln -s %{_fontconfig_templatedir}/$fconf \
+ %{buildroot}%{_fontconfig_confdir}/$fconf
+done
-%if 0%{?fedora} >= 21
-install -Dm 0644 -p %{SOURCE2} \
+# Add AppStream metadata file, Repeat for every font family
+install -Dm 0644 -p %{SOURCE3} \
%{buildroot}%{_datadir}/metainfo/%{fontname}.metainfo.xml
%check
appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{fontname}.metainfo.xml
-%endif
-%_font_pkg -f %{fontconf} *.ttf *.otf
-%if 0%{?fedora} >= 21
-%{_datadir}/metainfo/%{fontname}.metainfo.xml
-%endif
-%license Montserrat-%{version}/OFL.txt
-%doc Montserrat-%{version}/README.md
%changelog
+* Wed May 27 2020 Akira TAGOH - 1:7.200-2.1
+- Backport fontconfig files from Fedora
+- Sub-packaging per family names as usually do in Fdora.
+ Resolves: rhbz#1777843
+
* Wed Feb 07 2018 Fedora Release Engineering - 1:7.200-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild