diff --git a/SOURCES/57-sorkintype-merriweather-fonts.conf b/SOURCES/57-sorkintype-merriweather-fonts.conf
new file mode 100644
index 0000000..6b20892
--- /dev/null
+++ b/SOURCES/57-sorkintype-merriweather-fonts.conf
@@ -0,0 +1,1218 @@
+
+
+
+
+
+
+ Merriweather Black Narrow
+
+
+ Merriweather
+
+
+ Black Narrow
+
+
+ Merriweather Condensed Black
+
+
+ Condensed Black
+
+
+
+ 80.0
+
+
+
+
+ Merriweather Black Wide
+
+
+ Merriweather
+
+
+ Black Wide
+
+
+ Merriweather Expanded Black
+
+
+ Expanded Black
+
+
+
+ 125.0
+
+
+
+
+ Merriweather Bold Narrow
+
+
+ Merriweather
+
+
+ Bold Narrow
+
+
+ Merriweather Condensed Bold
+
+
+ Condensed Bold
+
+
+
+ 80.0
+
+
+
+
+ Merriweather Bold Wide
+
+
+ Merriweather
+
+
+ Bold Wide
+
+
+ Merriweather Expanded Bold
+
+
+ Expanded Bold
+
+
+
+ 125.0
+
+
+
+
+ Merriweather Light Narrow
+
+
+ Merriweather
+
+
+ Light Narrow
+
+
+ Merriweather Condensed Light
+
+
+ Condensed Light
+
+
+
+ 80.0
+
+
+
+
+ Merriweather Light Wide
+
+
+ Merriweather
+
+
+ Light Wide
+
+
+ Merriweather Expanded Light
+
+
+ Expanded Light
+
+
+
+ 125.0
+
+
+
+
+ Merriweather Regular
+
+
+ Merriweather
+
+
+ Regular
+
+
+ Merriweather
+
+
+
+
+ Merriweather Regular Narrow
+
+
+ Merriweather
+
+
+ Regular Narrow
+
+
+ Merriweather Condensed
+
+
+ Condensed
+
+
+
+ 80.0
+
+
+
+
+ Merriweather Regular Wide
+
+
+ Merriweather
+
+
+ Regular Wide
+
+
+ Merriweather Expanded
+
+
+ Expanded
+
+
+
+ 125.0
+
+
+
+
+ Merriweather Light Italic
+
+
+ Merriweather
+
+
+ Light Italic
+
+
+
+ 50.0
+
+
+
+
+ Merriweather Italic
+
+
+ Merriweather
+
+
+ Italic
+
+
+
+ 80.0
+
+
+
+
+ Merriweather Bold Italic
+
+
+ Merriweather
+
+
+ Bold Italic
+
+
+
+ 200.0
+
+
+
+
+ Merriweather Black Italic
+
+
+ Merriweather
+
+
+ Black Italic
+
+
+
+ 210.0
+
+
+
+
+ Merriweather Light
+
+
+ Merriweather
+
+
+ Light
+
+
+
+ 50.0
+
+
+
+
+ Merriweather Regular
+
+
+ Merriweather
+
+
+ Regular
+
+
+ Merriweather
+
+
+
+ 80.0
+
+
+
+
+ Merriweather Bold
+
+
+ Merriweather
+
+
+ Bold
+
+
+
+ 200.0
+
+
+
+
+ Merriweather Black
+
+
+ Merriweather
+
+
+ Black
+
+
+
+ 210.0
+
+
+
+ Merriweather
+
+ serif
+
+
+
+ serif
+
+ Merriweather
+
+
+
+
+ Merriweather Black Text
+
+
+ Merriweather
+
+
+ Black Text
+
+
+ Merriweather Text Black
+
+
+ Merriweather Text
+
+
+ Black
+
+
+
+ 210.0
+
+
+
+
+ Merriweather Black Text Narrow
+
+
+ Merriweather
+
+
+ Black Text Narrow
+
+
+ Merriweather Text Condensed Black
+
+
+ Merriweather Text
+
+
+ Condensed Black
+
+
+
+ 80.0
+
+
+
+
+ Merriweather Black Text Wide
+
+
+ Merriweather
+
+
+ Black Text Wide
+
+
+ Merriweather Text Expanded Black
+
+
+ Merriweather Text
+
+
+ Expanded Black
+
+
+
+ 125.0
+
+
+
+
+ Merriweather Bold Text
+
+
+ Merriweather
+
+
+ Bold Text
+
+
+ Merriweather Text Bold
+
+
+ Merriweather Text
+
+
+ Bold
+
+
+
+
+ Merriweather Bold Text Narrow
+
+
+ Merriweather
+
+
+ Bold Text Narrow
+
+
+ Merriweather Text Condensed Bold
+
+
+ Merriweather Text
+
+
+ Condensed Bold
+
+
+
+ 80.0
+
+
+
+
+ Merriweather Bold Text Wide
+
+
+ Merriweather
+
+
+ Bold Text Wide
+
+
+ Merriweather Text Expanded Bold
+
+
+ Merriweather Text
+
+
+ Expanded Bold
+
+
+
+ 125.0
+
+
+
+
+ Merriweather Light Text
+
+
+ Merriweather
+
+
+ Light Text
+
+
+ Merriweather Text Light
+
+
+ Merriweather Text
+
+
+ Light
+
+
+
+
+ Merriweather Light Text Narrow
+
+
+ Merriweather
+
+
+ Light Text Narrow
+
+
+ Merriweather Text Condensed Light
+
+
+ Merriweather Text
+
+
+ Condensed Light
+
+
+
+ 80.0
+
+
+
+
+ Merriweather Light Text Wide
+
+
+ Merriweather
+
+
+ Light Text Wide
+
+
+ Merriweather Text Expanded Light
+
+
+ Merriweather Text
+
+
+ Expanded Light
+
+
+
+ 125.0
+
+
+
+
+ Merriweather Regular Text
+
+
+ Merriweather
+
+
+ Regular Text
+
+
+ Merriweather Text
+
+
+ Merriweather Text
+
+
+ Regular
+
+
+
+
+ Merriweather Regular Text Narrow
+
+
+ Merriweather
+
+
+ Regular Text Narrow
+
+
+ Merriweather Text Condensed
+
+
+ Merriweather Text
+
+
+ Condensed
+
+
+
+ 80.0
+
+
+
+
+ Merriweather Regular Text Wide
+
+
+ Merriweather
+
+
+ Regular Text Wide
+
+
+ Merriweather Text Expanded
+
+
+ Merriweather Text
+
+
+ Expanded
+
+
+
+ 125.0
+
+
+
+
+ Merriweather
+
+
+ 54.0
+
+
+ 90.0
+
+
+ Merriweather Text
+
+
+
+ Merriweather Text
+
+ Merriweather
+
+
+
+ Merriweather
+
+ Merriweather Text
+
+
+
+
+ Merriweather Black Heading
+
+
+ Merriweather
+
+
+ Black Heading
+
+
+ Merriweather Heading Black
+
+
+ Merriweather Heading
+
+
+ Black
+
+
+
+
+ Merriweather Black Heading Narrow
+
+
+ Merriweather
+
+
+ Black Heading Narrow
+
+
+ Merriweather Heading Condensed Black
+
+
+ Merriweather Heading
+
+
+ Condensed Black
+
+
+
+ 80.0
+
+
+
+
+ Merriweather Black Heading Wide
+
+
+ Merriweather
+
+
+ Black Heading Wide
+
+
+ Merriweather Heading Expanded Black
+
+
+ Merriweather Heading
+
+
+ Expanded Black
+
+
+
+ 125.0
+
+
+
+
+ Merriweather Bold Heading
+
+
+ Merriweather
+
+
+ Bold Heading
+
+
+ Merriweather Heading Bold
+
+
+ Merriweather Heading
+
+
+ Bold
+
+
+
+
+ Merriweather Bold Heading Narrow
+
+
+ Merriweather
+
+
+ Bold Heading Narrow
+
+
+ Merriweather Heading Condensed Bold
+
+
+ Merriweather Heading
+
+
+ Condensed Bold
+
+
+
+ 80.0
+
+
+
+
+ Merriweather Bold Heading Wide
+
+
+ Merriweather
+
+
+ Bold Heading Wide
+
+
+ Merriweather Heading Expanded Bold
+
+
+ Merriweather Heading
+
+
+ Expanded Bold
+
+
+
+ 125.0
+
+
+
+
+ Merriweather Light Heading
+
+
+ Merriweather
+
+
+ Light Heading
+
+
+ Merriweather Heading Light
+
+
+ Merriweather Heading
+
+
+ Light
+
+
+
+
+ Merriweather Light Heading Narrow
+
+
+ Merriweather
+
+
+ Light Heading Narrow
+
+
+ Merriweather Heading Condensed Light
+
+
+ Merriweather Heading
+
+
+ Condensed Light
+
+
+
+ 80.0
+
+
+
+
+ Merriweather Light Heading Wide
+
+
+ Merriweather
+
+
+ Light Heading Wide
+
+
+ Merriweather Heading Expanded Light
+
+
+ Merriweather Heading
+
+
+ Expanded Light
+
+
+
+ 125.0
+
+
+
+
+ Merriweather Regular Heading Narrow
+
+
+ Merriweather
+
+
+ Regular Heading Narrow
+
+
+ Merriweather Heading Condensed
+
+
+ Merriweather Heading
+
+
+ Condensed
+
+
+
+ 80.0
+
+
+
+
+ Merriweather Regular Heading Wide
+
+
+ Merriweather
+
+
+ Regular Heading Wide
+
+
+ Merriweather Heading Expanded
+
+
+ Merriweather Heading
+
+
+ Expanded
+
+
+
+ 125.0
+
+
+
+
+ Merriweather Regular Heading
+
+
+ Merriweather
+
+
+ Regular Heading
+
+
+ Merriweather Heading
+
+
+ Merriweather Heading
+
+
+ Regular
+
+
+
+
+ Merriweather
+
+
+ 90.0
+
+
+ 144.0
+
+
+ Merriweather Heading
+
+
+
+ Merriweather Heading
+
+ Merriweather
+
+
+
+ Merriweather
+
+ Merriweather Heading
+
+
+
+
+ Merriweather Black Display
+
+
+ Merriweather
+
+
+ Black Display
+
+
+ Merriweather Display Black
+
+
+ Merriweather Display
+
+
+ Black
+
+
+
+
+ Merriweather Black Display Narrow
+
+
+ Merriweather
+
+
+ Black Display Narrow
+
+
+ Merriweather Display Condensed Black
+
+
+ Merriweather Display
+
+
+ Condensed Black
+
+
+
+ 80.0
+
+
+
+
+ Merriweather Black Display Wide
+
+
+ Merriweather
+
+
+ Black Display Wide
+
+
+ Merriweather Display Expanded Black
+
+
+ Merriweather Display
+
+
+ Expanded Black
+
+
+
+ 125.0
+
+
+
+
+ Merriweather Bold Display
+
+
+ Merriweather
+
+
+ Bold Display
+
+
+ Merriweather Display Bold
+
+
+ Merriweather Display
+
+
+ Bold
+
+
+
+
+ Merriweather Bold Display Narrow
+
+
+ Merriweather
+
+
+ Bold Display Narrow
+
+
+ Merriweather Display Condensed Bold
+
+
+ Merriweather Display
+
+
+ Condensed Bold
+
+
+
+ 80.0
+
+
+
+
+ Merriweather Bold Display Wide
+
+
+ Merriweather
+
+
+ Bold Display Wide
+
+
+ Merriweather Display Expanded Bold
+
+
+ Merriweather Display
+
+
+ Expanded Bold
+
+
+
+ 125.0
+
+
+
+
+ Merriweather Light Display
+
+
+ Merriweather
+
+
+ Light Display
+
+
+ Merriweather Display Light
+
+
+ Merriweather Display
+
+
+ Light
+
+
+
+
+ Merriweather Light Display Narrow
+
+
+ Merriweather
+
+
+ Light Display Narrow
+
+
+ Merriweather Display Condensed Light
+
+
+ Merriweather Display
+
+
+ Condensed Light
+
+
+
+ 80.0
+
+
+
+
+ Merriweather Light Display Wide
+
+
+ Merriweather
+
+
+ Light Display Wide
+
+
+ Merriweather Display Expanded Light
+
+
+ Merriweather Display
+
+
+ Expanded Light
+
+
+
+ 125.0
+
+
+
+
+ Merriweather Regular Display
+
+
+ Merriweather
+
+
+ Regular Display
+
+
+ Merriweather Display
+
+
+ Merriweather Display
+
+
+ Regular
+
+
+
+
+ Merriweather Regular Display Narrow
+
+
+ Merriweather
+
+
+ Regular Display Narrow
+
+
+ Merriweather Display Condensed
+
+
+ Merriweather Display
+
+
+ Condensed
+
+
+
+ 80.0
+
+
+
+
+ Merriweather Regular Display Wide
+
+
+ Merriweather
+
+
+ Regular Display Wide
+
+
+ Merriweather Display Expanded
+
+
+ Merriweather Display
+
+
+ Expanded
+
+
+
+ 125.0
+
+
+
+
+ Merriweather
+
+
+ 144.0
+
+
+ Merriweather Display
+
+
+
+ Merriweather Display
+
+ Merriweather
+
+
+
+ Merriweather
+
+ Merriweather Display
+
+
+
+
diff --git a/SOURCES/57-sorkintype-merriweather-fonts.xml b/SOURCES/57-sorkintype-merriweather-fonts.xml
deleted file mode 100644
index 9df96c1..0000000
--- a/SOURCES/57-sorkintype-merriweather-fonts.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-
-
-
-
-
- Merriweather
-
- optical size
-
- Regular
- 12
-
- Display
- Heading
- Text
-
-
-
- Text
- 54
-
- Merriweather
- Text
-
-
-
- Heading
- 90
-
- Merriweather
- Heading
-
-
-
- Display
- 144
-
- Merriweather
- Display
-
-
-
-
- weight
-
- Light
- 50
-
-
- Regular
- 80
-
-
- Bold
- 200
-
-
- Black
- 210
-
-
-
- width
-
- Condensed
- 80
-
- Narrow
-
-
-
- Regular
- 100
-
-
- Expanded
- 125
-
- Wide
-
-
-
-
- serif
-
-
-
-
diff --git a/SOURCES/org.fedoraproject.sorkintype-merriweather-fonts.metainfo.xml b/SOURCES/org.fedoraproject.sorkintype-merriweather-fonts.metainfo.xml
new file mode 100644
index 0000000..df3ee52
--- /dev/null
+++ b/SOURCES/org.fedoraproject.sorkintype-merriweather-fonts.metainfo.xml
@@ -0,0 +1,228 @@
+
+
+
+ org.fedoraproject.sorkintype-merriweather-fonts
+ MIT
+ OFL
+ SorkinType Merriweather
+
+
+
+
+ fonts@lists.fedoraproject.org
+ https://github.com/SorkinType/Merriweather
+
+
+
+
+
+ Merriweather Black Display Narrow
+ Merriweather Black Display Wide
+ Merriweather Black Display
+ Merriweather Black Heading Narrow
+ Merriweather Black Heading Wide
+ Merriweather Black Heading
+ Merriweather Black Italic
+ Merriweather Black Narrow
+ Merriweather Black Text Narrow
+ Merriweather Black Text Wide
+ Merriweather Black Text
+ Merriweather Black Wide
+ Merriweather Black
+ Merriweather Bold Display Narrow
+ Merriweather Bold Display Wide
+ Merriweather Bold Display
+ Merriweather Bold Heading Narrow
+ Merriweather Bold Heading Wide
+ Merriweather Bold Heading
+ Merriweather Bold Italic
+ Merriweather Bold Narrow
+ Merriweather Bold Text Narrow
+ Merriweather Bold Text Wide
+ Merriweather Bold Text
+ Merriweather Bold Wide
+ Merriweather Bold
+ Merriweather Italic
+ Merriweather Light Display Narrow
+ Merriweather Light Display Wide
+ Merriweather Light Display
+ Merriweather Light Heading Narrow
+ Merriweather Light Heading Wide
+ Merriweather Light Heading
+ Merriweather Light Italic
+ Merriweather Light Narrow
+ Merriweather Light Text Narrow
+ Merriweather Light Text Wide
+ Merriweather Light Text
+ Merriweather Light Wide
+ Merriweather Light
+ Merriweather Regular Display Narrow
+ Merriweather Regular Display Wide
+ Merriweather Regular Display
+ Merriweather Regular Heading Narrow
+ Merriweather Regular Heading Wide
+ Merriweather Regular Heading
+ Merriweather Regular Narrow
+ Merriweather Regular Text Narrow
+ Merriweather Regular Text Wide
+ Merriweather Regular Text
+ Merriweather Regular Wide
+ Merriweather Regular
+
+
+ aa
+ ab
+ an
+ ast
+ av
+ ay
+ az-az
+ ba
+ be
+ bg
+ bi
+ bin
+ br
+ bs
+ bua
+ ca
+ ce
+ ch
+ chm
+ co
+ crh
+ cs
+ csb
+ cv
+ cy
+ da
+ de
+ en
+ eo
+ es
+ et
+ eu
+ fi
+ fil
+ fj
+ fo
+ fr
+ fur
+ fy
+ ga
+ gd
+ gl
+ gn
+ gv
+ haw
+ ho
+ hr
+ hsb
+ ht
+ hu
+ ia
+ id
+ ie
+ ig
+ ik
+ io
+ is
+ it
+ jv
+ kaa
+ ki
+ kj
+ kk
+ kl
+ ku-am
+ ku-tr
+ kum
+ kv
+ kw
+ kwm
+ ky
+ la
+ lb
+ lez
+ lg
+ li
+ lt
+ lv
+ mg
+ mh
+ mk
+ mn-mn
+ mo
+ ms
+ mt
+ na
+ nb
+ nds
+ ng
+ nl
+ nn
+ no
+ nr
+ nso
+ nv
+ ny
+ oc
+ om
+ os
+ pap-an
+ pap-aw
+ pl
+ pt
+ qu
+ quz
+ rm
+ rn
+ ro
+ ru
+ rw
+ sah
+ sc
+ se
+ sel
+ sg
+ sh
+ sk
+ sl
+ sm
+ sma
+ smj
+ smn
+ sms
+ sn
+ so
+ sq
+ sr
+ ss
+ st
+ su
+ sv
+ sw
+ tg
+ tk
+ tl
+ tn
+ to
+ tr
+ ts
+ tt
+ ty
+ tyv
+ uk
+ uz
+ vi
+ vo
+ vot
+ wa
+ wen
+ wo
+ xh
+ yap
+ za
+ zu
+
+
diff --git a/SPECS/sorkintype-merriweather-fonts.spec b/SPECS/sorkintype-merriweather-fonts.spec
index 7b04d64..efe00af 100644
--- a/SPECS/sorkintype-merriweather-fonts.spec
+++ b/SPECS/sorkintype-merriweather-fonts.spec
@@ -1,36 +1,27 @@
-# SPDX-License-Identifier: MIT
-%global forgeurl https://github.com/SorkinType/Merriweather
-%global commit fad21f97f3525af393d7a1d6c2995cbaf4b0cd7b
-%forgemeta
+BuildArch: noarch
+Name: sorkintype-merriweather-fonts
Version: 2.008
-Release: 8%{?dist}
-URL: %{forgeurl}
-
-%global foundry SorkinType
-%global fontlicense OFL
-%global fontlicenses OFL.txt
-%global fontdocs *txt *md
-%global fontdocsex %{fontlicenses}
-
-%global fontfamily Merriweather
-%global fontsummary Merriweather, a warm space-saving serif font family
-%global fonts fonts/ttfs/*ttf fonts/variable/*ttf
-%global fontsex fonts/variable/*WO7*ttf fonts/ttfs/Merriweather35*ttf
-%global fontconfngs %{SOURCE10}
-%global fontdescription %{expand:
+Release: 8.20240109gitfad21f9%{?dist}
+URL: https://github.com/SorkinType/Merriweather
+License: OFL
+Summary: Merriweather, a warm space-saving serif font family
+
+Source0: Merriweather-fad21f97f3525af393d7a1d6c2995cbaf4b0cd7b.tar.gz
+Source10: 57-%{name}.conf
+Source11: org.fedoraproject.sorkintype-merriweather-fonts.metainfo.xml
+
+Requires: fontpackages-filesystem
+
+%description
Merriweather offers a Renaissance warmth while using proportions which are
space-saving. It is suitable for editorial design, news and other kinds of
space sensitive typography.
Merriweather was designed to be a text face that is pleasant to read on
screens. It features a very large x height, slightly condensed letter-forms, a
-mild diagonal stress, sturdy serifs and open forms}
-
-Source0: %{forgesource}
-Source10: 57-%{fontpkgname}.xml
+mild diagonal stress, sturdy serifs and open forms
-%fontpkg
%package doc
Summary: Optional documentation files of %{name}
@@ -39,19 +30,36 @@ BuildArch: noarch
This package provides optional documentation files shipped with
%{name}.
+
%prep
-%forgesetup
+%autosetup -n Merriweather-fad21f97f3525af393d7a1d6c2995cbaf4b0cd7b
+
%build
-%fontbuild
+# nothing to do here
+
%install
-%fontinstall
+install -m 0755 -d %{buildroot}%{_sysconfdir}/fonts/conf.d
+install -m 0755 -d %{buildroot}%{_datadir}/fonts/%{name}
+install -m 0755 -d %{buildroot}%{_datadir}/fontconfig/conf.avail
+install -m 0755 -d %{buildroot}/%{_datadir}/metainfo/
+
+install -m 0644 -t %{buildroot}/usr/share/fontconfig/conf.avail/ %{SOURCE10}
+ln -sr %{buildroot}%{_datadir}/fontconfig/conf.avail/* %{buildroot}%{_sysconfdir}/fonts/conf.d/
+cp -vf fonts/ttfs/*.ttf fonts/variable/*.ttf %{buildroot}%{_datadir}/fonts/%{name}
-%check
-%fontcheck
+install -m 0644 -t %{buildroot}/usr/share/metainfo/ %{SOURCE11}
+
+
+%files
+%doc README.md AUTHORS.txt CONTRIBUTORS.txt TRADEMARKS.txt
+%config %{_sysconfdir}/fonts/conf.d/57-%{name}.conf
+%{_datadir}/fonts/%{name}/*.ttf
+%{_datadir}/fontconfig/conf.avail/57-%{name}.conf
+%{_datadir}/metainfo/*.xml
+%license OFL.txt
-%fontfiles
%files doc
%defattr(644, root, root, 0755)
@@ -59,8 +67,8 @@ This package provides optional documentation files shipped with
%doc documents/*
%changelog
-* Wed Nov 22 2023 MSVSphere Packaging Team - 2.008-8.gitfad21f9
-- Rebuilt for MSVSphere 9.3
+* Wed Feb 21 2024 Sergey Cherevko - 2.008-8.20240109gitfad21f9
+- Rebuilt for MSVSphere 8.9
* Sat Jan 21 2023 Fedora Release Engineering - 2.008-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild