diff --git a/.gitignore b/.gitignore
index 944c11a..821186e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/RedHatFont-2.2.0.tar.gz
/RedHatFont-2.3.2.tar.gz
+/RedHatFont-4.0.1.tar.gz
diff --git a/64-redhat-mono-fontconfig.conf b/64-redhat-mono-fontconfig.conf
new file mode 100644
index 0000000..c05bcdb
--- /dev/null
+++ b/64-redhat-mono-fontconfig.conf
@@ -0,0 +1,18 @@
+
+
+
+
+
+ Red Hat Mono
+
+ monospace
+
+
+
+
+ monospace
+
+ Red Hat Mono
+
+
+
diff --git a/redhat-fonts.spec b/redhat-fonts.spec
index d535b76..57a8da2 100644
--- a/redhat-fonts.spec
+++ b/redhat-fonts.spec
@@ -5,7 +5,7 @@
%global projname RedHatFont
%global desc \
-Red Hat is a fresh take on the geometric sans genre, \
+Red Hat Typeface is a fresh take on the geometric sans genre, \
taking inspiration from a range of American sans serifs \
including Tempo and Highway Gothic. \
\
@@ -16,15 +16,18 @@ The Text styles have a slightly smaller x-height and narrower width \
for better legibility, are spaced more generously, and have thinned joins \
for better performance at small sizes. \
\
-The two families can be used together seamlessly at a range of sizes. \
+The Mono styles are similar to the Text styles, but are adapted \
+for better performance to render code and similar text. \
+ \
+The three families can be used together seamlessly at a range of sizes. \
\
The fonts were originally commissioned by Paula Scher / Pentagram \
and designed by Jeremy Mickel / MCKL for the new Red Hat identity.
Name: %{fontname}-fonts
-Version: 2.3.2
-Release: 4%{?dist}
-Summary: Red Hat fonts
+Version: 4.0.1
+Release: 1%{?dist}
+Summary: Red Hat Typeface fonts
# Only the metainfo files are CC-BY-SA
License: OFL and CC-BY-SA
URL: https://github.com/RedHatOfficial/%{projname}
@@ -32,6 +35,7 @@ URL: https://github.com/RedHatOfficial/%{projname}
Source0: %{url}/archive/%{version}/%{projname}-%{version}.tar.gz
Source1: %{fontconf}-display-fontconfig.conf
Source2: %{fontconf}-text-fontconfig.conf
+Source3: %{fontconf}-mono-fontconfig.conf
BuildArch: noarch
BuildRequires: %{_bindir}/appstream-util
@@ -56,6 +60,14 @@ Requires: fontpackages-filesystem
This package provides the Text fonts variant.
+%package -n %{fontname}-mono-fonts
+Summary: Red Hat Mono fonts
+Requires: fontpackages-filesystem
+
+%description -n %{fontname}-mono-fonts %{desc}
+
+This package provides the Monospace fonts variant.
+
%prep
%autosetup -n %{projname}-%{version} -p1
@@ -67,8 +79,9 @@ This package provides the Text fonts variant.
# Install fonts
install -m 0755 -d %{buildroot}%{_fontdir}
-install -m 0644 -p OTF/*.otf %{buildroot}%{_fontdir}
-install -m 0644 -p TTF/*.ttf %{buildroot}%{_fontdir}
+install -m 0644 -p fonts/*/static/otf/*.otf %{buildroot}%{_fontdir}
+install -m 0644 -p fonts/*/static/ttf/*.ttf %{buildroot}%{_fontdir}
+install -m 0644 -p fonts/*/*.ttf %{buildroot}%{_fontdir}
# Install fontconfig data
install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
@@ -80,7 +93,10 @@ install -m 0644 -p %{SOURCE1} \
install -m 0644 -p %{SOURCE2} \
%{buildroot}%{_fontconfig_templatedir}/%{fontconf}-text.conf
-for fconf in %{fontconf}-display.conf %{fontconf}-text.conf; do
+install -m 0644 -p %{SOURCE3} \
+ %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-mono.conf
+
+for fconf in %{fontconf}-display.conf %{fontconf}-text.conf %{fontconf}-mono.conf; do
ln -s %{_fontconfig_templatedir}/$fconf %{buildroot}%{_fontconfig_confdir}/$fconf
done
@@ -103,8 +119,16 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.metainf
%doc README.md CHANGELOG.md *.png
%{_datadir}/metainfo/%{asfontname}-text.metainfo.xml
+%_font_pkg -n mono -f %{fontconf}-mono.conf RedHatMono*.?tf
+%license LICENSE metainfo/LICENSE-METAINFO
+%doc README.md CHANGELOG.md *.png
+%{_datadir}/metainfo/%{asfontname}-mono.metainfo.xml
+
%changelog
+* Fri Apr 23 2021 Neal Gompa - 4.0.1-1
+- Rebase to 4.0.1 (RH#1917996)
+
* Wed Jan 27 2021 Fedora Release Engineering - 2.3.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
diff --git a/sources b/sources
index 981c869..a3429f1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (RedHatFont-2.3.2.tar.gz) = 8e2bde755ef3cecb15cb52b6719338dfd219d470ee74e9c6df687595c6573365ae97b87817c0da1dfd46d6d702b958eee0be908ba04eb4ecea9ca1db4fc153b1
+SHA512 (RedHatFont-4.0.1.tar.gz) = 7ff8a3c71ad9ea4432cfbe417a5e5a96711fce0c104c424ee9112deb63dd90200b423f3bb5bd3364f68e6cbdc074c41bdc48d642928998e683a78df63a44d8a0