diff --git a/.gitignore b/.gitignore
index 01ba2b7..f9c7d02 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,3 @@
/SourceCodePro_FontsOnly-1.017.zip
/SourceCodePro-2.010R-ro-1.030R-it.tar.gz
/SourceCodePro-2.030R-ro-1.050R-it.tar.gz
-/source-code-pro-2.042R-u-1.062R-i-1.026R-vf.tar.gz
diff --git a/61-adobe-source-code-pro-fonts.conf b/61-adobe-source-code-pro-fonts.conf
deleted file mode 100644
index 0693b1f..0000000
--- a/61-adobe-source-code-pro-fonts.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
- monospace
-
- Source Code Pro
-
-
-
-
-
- Source Code Pro
-
- monospace
-
-
-
diff --git a/61-adobe-source-code-vf-fonts.conf b/61-adobe-source-code-vf-fonts.conf
deleted file mode 100644
index 3ef8c78..0000000
--- a/61-adobe-source-code-vf-fonts.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
- monospace
-
- Source Code VF
-
-
-
-
-
- Source Code VF
-
- monospace
-
-
-
diff --git a/SourceCodePro-2.030R-ro-1.050R-it.tar.gz b/SourceCodePro-2.030R-ro-1.050R-it.tar.gz
new file mode 100644
index 0000000..96bfe5e
Binary files /dev/null and b/SourceCodePro-2.030R-ro-1.050R-it.tar.gz differ
diff --git a/adobe-source-code-pro-fonts-fontconfig.conf b/adobe-source-code-pro-fonts-fontconfig.conf
new file mode 100644
index 0000000..f3a55c1
--- /dev/null
+++ b/adobe-source-code-pro-fonts-fontconfig.conf
@@ -0,0 +1,16 @@
+
+
+
+
+ monospace
+
+ Source Code Pro
+
+
+
+ Source Code Pro
+
+ monospace
+
+
+
diff --git a/adobe-source-code-pro-fonts.spec b/adobe-source-code-pro-fonts.spec
index ebc43f4..f79a044 100644
--- a/adobe-source-code-pro-fonts.spec
+++ b/adobe-source-code-pro-fonts.spec
@@ -1,60 +1,125 @@
-%global foundry adobe
-%global fontlicense OFL-1.1
-%global fontlicenses LICENSE.md
-%global fontdocs README.md
-%global fontdocsex %{fontlicenses}
+%global fontname adobe-source-code-pro
+%global fontconf 61-%{fontname}.conf
+%global version_roman 2.030
+%global version_italic 1.050
-%global fontfamily Source Code Pro
-%global fontsummary A set of mono-spaced OpenType fonts designed for coding environments
-%global fontpkgheader %{expand:
-Suggests: font(sourcecodevf)}
-%global fonts OTF/*.otf
-%global fontconfs %{SOURCE10}
-%global fontdescription %{expand:
+Name: %{fontname}-fonts
+Version: %{version_roman}.%{version_italic}
+Release: 9%{?dist}
+Summary: A set of mono-spaced OpenType fonts designed for coding environments
+
+License: OFL
+URL: https://github.com/adobe-fonts/source-code-pro
+Source0: https://github.com/adobe-fonts/source-code-pro/archive/%{version_roman}R-ro%2f%{version_italic}R-it.tar.gz#/SourceCodePro-%{version_roman}R-ro-%{version_italic}R-it.tar.gz
+Source1: %{name}-fontconfig.conf
+Source2: %{fontname}.metainfo.xml
+
+BuildArch: noarch
+BuildRequires: fontpackages-devel
+Requires: fontpackages-filesystem
+
+%description
This font was designed by Paul D. Hunt as a companion to Source Sans. It has
the same weight range as the corresponding Source Sans design. It supports
a wide range of languages using the Latin script, and includes all the
-characters in the Adobe Latin 4 glyph set.}
+characters in the Adobe Latin 4 glyph set.
-%global fontfamily2 Source Code VF
-%global fontsummary2 OpenType fonts designed for coding environments, variable versions
-%global fontpkgheader1 %{expand:
-Suggests: font(sourcecodepro)}
-%global fonts2 VF/*.otf
-%global fontconfs2 %{SOURCE11}
-%global fontdescription2 %{expand:
-%{fontdescription}
-
-This is the variable versions of the font Source Code Pro.}}
-
-%global version_roman 2.042
-%global version_italic 1.062
-%global version_vf 1.026
-
-Version: %{version_roman}.%{version_italic}.%{version_vf}
-Release: %autorelease
-URL: https://github.com/adobe-fonts/source-code-pro
-
-Source: https://github.com/adobe-fonts/source-code-pro/archive/%{version_roman}R-u/%{version_italic}R-i/%{version_vf}R-vf.tar.gz#/source-code-pro-%{version_roman}R-u-%{version_italic}R-i-%{version_vf}R-vf.tar.gz
-Source10: 61-%{name}.conf
-Source11: 61-%{fontpkgname2}.conf
-
-%fontpkg -a
%prep
-%autosetup -n source-code-pro-%{version_roman}R-u-%{version_italic}R-i-%{version_vf}R-vf
+%setup -qn source-code-pro-%{version_roman}R-ro-%{version_italic}R-it
+sed -i 's/\r//' LICENSE.txt
+chmod 644 LICENSE.txt
%build
-%fontbuild -a
%install
-%fontinstall -a
+install -m 0755 -d %{buildroot}%{_fontdir}
+install -m 0644 -p OTF/*.otf %{buildroot}%{_fontdir}
-%check
-%fontcheck -a
+install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
+ %{buildroot}%{_fontconfig_confdir}
-%fontfiles -a
+install -m 0644 -p %{SOURCE1} \
+ %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
+ln -s %{_fontconfig_templatedir}/%{fontconf} \
+ %{buildroot}%{_fontconfig_confdir}/%{fontconf}
+
+# Add AppStream metadata
+install -Dm 0644 -p %{SOURCE2} \
+ %{buildroot}%{_datadir}/appdata/%{fontname}.metainfo.xml
+
+%_font_pkg -f %{fontconf} *.otf
+%{_datadir}/appdata/%{fontname}.metainfo.xml
+
+%doc README.md
+%license LICENSE.txt
%changelog
-%autochangelog
+* Mon Jul 27 2020 Fedora Release Engineering - 2.030.1.050-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Jan 28 2020 Fedora Release Engineering - 2.030.1.050-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Wed Jul 24 2019 Fedora Release Engineering - 2.030.1.050-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Thu Jan 31 2019 Fedora Release Engineering - 2.030.1.050-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Jul 12 2018 Fedora Release Engineering - 2.030.1.050-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Wed Feb 07 2018 Fedora Release Engineering - 2.030.1.050-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering - 2.030.1.050-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Fri Feb 10 2017 Fedora Release Engineering - 2.030.1.050-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Sat Jul 23 2016 Michael Kuhn - 2.030.1.050-1
+- Update to roman fonts 2.030 and italic fonts 1.050
+
+* Wed Feb 03 2016 Fedora Release Engineering - 2.010.1.030-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Fri Nov 06 2015 Jamie Nguyen - 2.010.1.030-1
+- update to 2.010 (roman) and 1.030 (italic)
+- update URL
+- use %%license macro
+
+* Tue Jun 16 2015 Fedora Release Engineering - 1.017-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Wed Oct 15 2014 Richard Hughes - 1.017-5
+- Add a MetaInfo file for the software center; this is a font we want to show.
+
+* Sat Jun 07 2014 Fedora Release Engineering - 1.017-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Fri Sep 13 2013 Matt Rose mattrose@folkwolf.net - 1.017-3
+- rebuilt on fedora 19
+
+* Mon Jan 21 2013 Tobias Florek me@ibotty.net - 1.017-2
+- remove now empty clean section
+
+* Thu Jan 17 2013 Tobias Florek me@ibotty.net - 1.017-1
+- new upstream release
+
+* Fri Dec 07 2012 Tobias Florek me@ibotty.net - 1.013-1
+- new upstream release
+
+* Sun Nov 18 2012 Tobias Florek me@ibotty.net - 1.010-2
+- do not clean buildroot on install and clean
+
+* Tue Oct 2 2012 Tobias Florek me@ibotty.net - 1.010-1
+- new upstream release
+
+* Tue Sep 25 2012 Tobias Florek me@ibotty.net - 1.009-3
+- do not package ttf files
+
+* Tue Sep 25 2012 Tobias Florek me@ibotty.net - 1.009-2
+- Initial version
diff --git a/adobe-source-code-pro.metainfo.xml b/adobe-source-code-pro.metainfo.xml
new file mode 100644
index 0000000..7fef7c8
--- /dev/null
+++ b/adobe-source-code-pro.metainfo.xml
@@ -0,0 +1,8 @@
+
+
+
+ adobe-source-code-pro
+ CC0-1.0
+ Source Code
+ A set of mono-spaced fonts designed for coding environments
+
diff --git a/changelog b/changelog
deleted file mode 100644
index ab39949..0000000
--- a/changelog
+++ /dev/null
@@ -1,85 +0,0 @@
-* Wed Jul 19 2023 Fedora Release Engineering - 2.030.1.050-15
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Wed Jan 18 2023 Fedora Release Engineering - 2.030.1.050-14
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Wed Jul 20 2022 Fedora Release Engineering - 2.030.1.050-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Wed Jan 19 2022 Fedora Release Engineering - 2.030.1.050-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Wed Jul 21 2021 Fedora Release Engineering - 2.030.1.050-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Mon Jan 25 2021 Fedora Release Engineering - 2.030.1.050-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Mon Jul 27 2020 Fedora Release Engineering - 2.030.1.050-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jan 28 2020 Fedora Release Engineering - 2.030.1.050-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Wed Jul 24 2019 Fedora Release Engineering - 2.030.1.050-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu Jan 31 2019 Fedora Release Engineering - 2.030.1.050-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Thu Jul 12 2018 Fedora Release Engineering - 2.030.1.050-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Wed Feb 07 2018 Fedora Release Engineering - 2.030.1.050-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering - 2.030.1.050-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Fri Feb 10 2017 Fedora Release Engineering - 2.030.1.050-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Sat Jul 23 2016 Michael Kuhn - 2.030.1.050-1
-- Update to roman fonts 2.030 and italic fonts 1.050
-
-* Wed Feb 03 2016 Fedora Release Engineering - 2.010.1.030-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Fri Nov 06 2015 Jamie Nguyen - 2.010.1.030-1
-- update to 2.010 (roman) and 1.030 (italic)
-- update URL
-- use %%license macro
-
-* Tue Jun 16 2015 Fedora Release Engineering - 1.017-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Wed Oct 15 2014 Richard Hughes - 1.017-5
-- Add a MetaInfo file for the software center; this is a font we want to show.
-
-* Sat Jun 07 2014 Fedora Release Engineering - 1.017-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Fri Sep 13 2013 Matt Rose mattrose@folkwolf.net - 1.017-3
-- rebuilt on fedora 19
-
-* Mon Jan 21 2013 Tobias Florek me@ibotty.net - 1.017-2
-- remove now empty clean section
-
-* Thu Jan 17 2013 Tobias Florek me@ibotty.net - 1.017-1
-- new upstream release
-
-* Fri Dec 07 2012 Tobias Florek me@ibotty.net - 1.013-1
-- new upstream release
-
-* Sun Nov 18 2012 Tobias Florek me@ibotty.net - 1.010-2
-- do not clean buildroot on install and clean
-
-* Tue Oct 2 2012 Tobias Florek me@ibotty.net - 1.010-1
-- new upstream release
-
-* Tue Sep 25 2012 Tobias Florek me@ibotty.net - 1.009-3
-- do not package ttf files
-
-* Tue Sep 25 2012 Tobias Florek me@ibotty.net - 1.009-2
-- Initial version
diff --git a/sources b/sources
index 3765bf8..e1fd16d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (source-code-pro-2.042R-u-1.062R-i-1.026R-vf.tar.gz) = 2cc2373c8f5ec817ee44e2c754735a4d21d989fd581bf1cdb764ba98a26b186574d7f583ebe0da905c4db029d12fd4df54ace43a191e274f76995940a618a91c
+8120607f75da3b25cb8e34b64f02af9c SourceCodePro-2.030R-ro-1.050R-it.tar.gz