.gitignore

@@ -1 +1 @@
-SOURCES/Montserrat-7.200.tar.gz
+SOURCES/Montserrat-7.210.tar.gz

.julietaula-montserrat-fonts.metadata

@@ -1 +1 @@
-b817b37e3951ac9056cddf5abae97453faa7ae57 SOURCES/Montserrat-7.200.tar.gz
+f1774f2e6b85ae32cb8dafeb0d36e6f2838d240c SOURCES/Montserrat-7.210.tar.gz

SOURCES/julietaula-montserrat-alternates.metainfo.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2016 Luya Tshimbalanga <luya@fedoraproject.org> -->
+<component type="font">
+  <id>julietaula-montserrat-alternates</id>
+  <metadata_license> CC0-1.0</metadata_license>
+  <name>Montserrat Alternates</name>
+  <summary>An alternate sans-serif typeface loved by web and UI designers</summary>
+  <description>
+    <p>The old posters and signs in the traditional neighborhood of Buenos Aires called Montserrat inspired me to design a typeface that rescues the beauty of urban typography from the first half of the twentieth century. The goal is to rescue what is in Montserrat and set it free, under a free, libre and open source license, the SIL Open Font License.</p>
+<p>As urban development changes this place, it will never return to its original form and loses forever the designs that are so special and unique. Each selected example produces its own variants in length, width and height proportions, each adding to the Montserrat family. The old typographies and canopies are irretrievable when they are replaced.</p>
+<p>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.</p>
+  </description>
+  <provides>
+	<font file="MontserratAlternates-Black.otf">Montserrat Alternates Black</font>
+	<font file="MontserratAlternates-Bold.otf">Montserrat Alternates Bold</font>
+	<font file="MontserratAlternates-ExtraBold.otf">Montserrat Alternates Extra Bold</font>
+	<font file="MontserratAlternates-Light.otf">Montserrat Alternates Light</font>
+	<font file="MontserratAlternates-Medium.otf">Montserrat Alternates Medium</font>
+	<font file="MontserratAlternates-Regular.otf">Montserrat Alternates Regular</font>
+	<font file="MontserratAlternates-SemiBold.otf">Montserrat Alternates Semi Bold</font>
+	<font file="MontserratAlternates-Thin.otf">Montserrat Alternates Thin</font>
+	<font file="MontserratAlternates-UltraLight.otf">Montserrat Alternates Ultra Light</font>
+  </provides>
+  <url type="homepage">https://github.com/JulietaUla/Montserrat/</url>
+  <updatecontact>luya@fedoraproject.org</updatecontact>
+</component>

SOURCES/julietaula-montserrat-fonts-alternates-fontconfig.conf

@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+  <alias>
+    <family>sans-serif</family>
+    <prefer>
+      <family>MontserratAlternates</family>
+    </prefer>
+  </alias>
+  <alias>
+    <family>MontserratAlternates</family>
+    <default>
+      <family>sans-serif</family>
+    </default>
+  </alias>
+</fontconfig>
+

SOURCES/julietaula-montserrat-fonts-fontconfig.conf

@@ -13,17 +13,5 @@
       <family>sans-serif</family>
     </default>
   </alias>
-  <alias>
-    <family>sans-serif</family>
-    <prefer>
-      <family>MontserratAlternates</family>
-    </prefer>
-  </alias>
-  <alias>
-    <family>MontserratAlternates</family>
-    <default>
-      <family>sans-serif</family>
-    </default>
-  </alias>
 </fontconfig>
 

SOURCES/julietaula-montserrat.metainfo.xml

@@ -11,15 +11,6 @@
 <p>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.</p>
   </description>
   <provides>
-	<font file="MontserratAlternates-Black.otf">Montserrat Alternates Black</font>
-	<font file="MontserratAlternates-Bold.otf">Montserrat Alternates Bold</font>
-	<font file="MontserratAlternates-ExtraBold.otf">Montserrat Alternates Extra Bold</font>
-	<font file="MontserratAlternates-Light.otf">Montserrat Alternates Light</font>
-	<font file="MontserratAlternates-Medium.otf">Montserrat Alternates Medium</font>
-	<font file="MontserratAlternates-Regular.otf">Montserrat Alternates Regular</font>
-	<font file="MontserratAlternates-SemiBold.otf">Montserrat Alternates Semi Bold</font>
-	<font file="MontserratAlternates-Thin.otf">Montserrat Alternates Thin</font>
-	<font file="MontserratAlternates-UltraLight.otf">Montserrat Alternates Ultra Light</font>
 	<font file="Montserrat-Black.otf">Montserrat Black</font>
 	<font file="Montserrat-Bold.otf">Montserrat Bold</font>
 	<font file="Montserrat-ExtraBold.otf">Montserrat Extra Bold</font>

SPECS/julietaula-montserrat-fonts.spec

@@ -1,20 +1,23 @@
 %global fontname julietaula-montserrat
 %global fontconf 61-%{fontname}
-%global common_desc \
+%global common_description %{expand: 
-A typeface inspired by signs around the Montserrat area of Buenos Aires, Argentina
+A typeface inspired by signs around the Montserrat area \
+of Buenos Aires, Argentina.}
 
 Name:		%{fontname}-fonts
-Version:	7.200
+Version:	7.210
-Release:	2%{?dist}.2
+Release:	6%{?dist}
 # Override versioning to sync with upstream
 Epoch:		1
 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
+Source0:	%{url}/releases/download/v%{version}/Montserrat-%{version}.tar.gz
 Source1:	%{name}-fontconfig.conf
+Source2:	%{name}-alternates-fontconfig.conf
 Source3:	%{fontname}.metainfo.xml
+Source4:	%{fontname}-alternates.metainfo.xml
 
 BuildArch:	noarch
 BuildRequires:	fontpackages-devel
@@ -26,12 +29,47 @@ Obsoletes:	%{name} < 1:%{version}-%{release}
 
 
 %description
-%common_desc
+%{common_description}
 
-%_font_pkg -f %{fontconf}.conf *.otf
+%package common
-%{_datadir}/metainfo/%{fontname}.metainfo.xml
+Summary:  Common files for %{name}
-%license Montserrat-%{version}/OFL.txt
+Requires: fontpackages-filesystem
-%doc Montserrat-%{version}/README.md 
+
+%description common
+%{common_description}
+This package consists of files used by other %{name} packages.
+
+%package	-n %{fontname}
+Summary:	Base version of the Montserrat area inspired typeface
+Requires:	%{name}-common = %{epoch}:%{version}-%{release}
+
+%description	-n %{fontname}
+%{common_description}
+This package provide the base fonts.
+
+%package 	-n %{fontname}-alternates-fonts
+Summary:	A Montserrat area inspired typeface family alternate version
+Requires:	%{name}-common = %{epoch}:%{version}-%{release}
+
+%description	-n %{fontname}-alternates-fonts
+%{common_description}
+This package provide an alternate version of the fonts.
+
+%package	-n %{fontname}-base-web-fonts
+Summary:	Web fonts version of the Montserrat area inspired typeface
+Requires:	%{name}-common = %{epoch}:%{version}-%{release}
+
+%description	-n %{fontname}-base-web-fonts
+%{common_description}
+This package include essential web fonts.
+
+%package	-n %{fontname}-extra-web-fonts
+Summary:	Extra web fonts version of the Montserrat area inspired typeface
+Requires:	%{name}-common = %{epoch}:%{version}-%{release}
+
+%description	-n %{fontname}-extra-web-fonts
+%{common_description}
+This package includes extra web fonts.
 
 %prep
 %autosetup -c
@@ -41,6 +79,8 @@ Obsoletes:	%{name} < 1:%{version}-%{release}
 
 %install
 install -Dpm 0644 Montserrat-%{version}/fonts/otf/*.otf -t %{buildroot}%{_fontdir}
+install -m 0644 -p Montserrat-%{version}/fonts/webfonts/*.woff %{buildroot}%{_fontdir}
+install -m 0644 -p Montserrat-%{version}/fonts/webfonts/*.woff2 %{buildroot}%{_fontdir}
 
 install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
 		%{buildroot}%{_fontconfig_confdir}
@@ -49,7 +89,12 @@ install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
 install -m 0644 -p %{SOURCE1} \
 		%{buildroot}%{_fontconfig_templatedir}/%{fontconf}.conf
 
-for fconf in %{fontconf}.conf ; do
+# Install MontserratAlternates fonts
+install -m 0644 -p %{SOURCE2} \
+		%{buildroot}%{_fontconfig_templatedir}/%{fontconf}-alternates.conf
+
+for fconf in %{fontconf}.conf \
+	     %{fontconf}-alternates.conf ; do
 	ln -s %{_fontconfig_templatedir}/$fconf \
 		%{buildroot}%{_fontconfig_confdir}/$fconf
 done
@@ -57,15 +102,65 @@ done
 # Add AppStream metadata file, Repeat for every font family
 install -Dm 0644 -p %{SOURCE3} \
 		%{buildroot}%{_datadir}/metainfo/%{fontname}.metainfo.xml
+install -Dm 0644 -p %{SOURCE4} \
+		%{buildroot}%{_datadir}/metainfo/%{fontname}-alternates.metainfo.xml
 
 %check
 appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{fontname}.metainfo.xml
+appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{fontname}-alternates.metainfo.xml
+
+%_font_pkg -f %{fontconf}.conf Montserrat-*.otf
+%{_datadir}/metainfo/%{fontname}.metainfo.xml
+%_font_pkg -n alternates -f %{fontconf}-alternates.conf MontserratAlternates-*.otf
+%{_datadir}/metainfo/%{fontname}-alternates.metainfo.xml
+%_font_pkg -n base-web Montserrat-{Regular,Light,Bold,ExtraBold,Italic}.{woff,woff2}
+%_font_pkg -n extra-web Montserrat*.{woff,woff2}
+
+%files common
+%license Montserrat-%{version}/OFL.txt
+%doc Montserrat-%{version}/README.md 
 
 %changelog
-* Wed May 27 2020 Akira TAGOH <tagoh@redhat.com> - 1:7.200-2.1
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1:7.210-6
-- Backport fontconfig files from Fedora
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-- Sub-packaging per family names as usually do in Fdora.
+  Related: rhbz#1991688
-  Resolves: rhbz#1777843
+
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1:7.210-5
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Fri Mar 05 2021 Luya Tshimbalanga <luya@fedoraproject.org> - 1:7.210-4
+- Add base and extra subpackage web fonts for Design Team
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:7.210-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:7.210-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Thu May 28 2020 Luya Tshimbalanga <luya@fedoraproject.org> - 1:7.210-1
+- Update to 7.210
+
+* Wed May 13 2020 Troy Dawson <tdawson@redhat.com> - 1:7.200-9
+- Minor conditional tweaks for ELN
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:7.200-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:7.200-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:7.200-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Sat Oct 27 2018 Luya Tshimbalanga <luya@fedoraproject.org> - 1:7.200-5
+- Add missing epoch for dependencies rhbz#1643607
+- Shorten the description
+
+* Sat Oct 20 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:7.200-4
+- Update spec file adhering to Fedora Fonts guideline rhbz#1628832
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:7.200-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:7.200-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild