diff --git a/30-0-google-croscore-arimo-fontconfig.conf b/30-0-google-arimo-fonts.conf
similarity index 100%
rename from 30-0-google-croscore-arimo-fontconfig.conf
rename to 30-0-google-arimo-fonts.conf
diff --git a/30-0-google-croscore-cousine-fontconfig.conf b/30-0-google-cousine-fonts.conf
similarity index 100%
rename from 30-0-google-croscore-cousine-fontconfig.conf
rename to 30-0-google-cousine-fonts.conf
diff --git a/30-0-google-croscore-tinos-fontconfig.conf b/30-0-google-tinos-fonts.conf
similarity index 100%
rename from 30-0-google-croscore-tinos-fontconfig.conf
rename to 30-0-google-tinos-fonts.conf
diff --git a/62-google-croscore-arimo-fontconfig.conf b/62-google-arimo-fonts.conf
similarity index 100%
rename from 62-google-croscore-arimo-fontconfig.conf
rename to 62-google-arimo-fonts.conf
diff --git a/62-google-croscore-cousine-fontconfig.conf b/62-google-cousine-fonts.conf
similarity index 100%
rename from 62-google-croscore-cousine-fontconfig.conf
rename to 62-google-cousine-fonts.conf
diff --git a/62-google-croscore-symbolneu-fontconfig.conf b/62-google-croscore-symbolneu-fontconfig.conf
deleted file mode 100644
index a0fed66..0000000
--- a/62-google-croscore-symbolneu-fontconfig.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
-<fontconfig>
-  <alias binding="same">
-    <family>Symbol</family>
-    <accept>
-      <family>Symbol Neu</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>Symbol Neu</family>
-     <default>
-       <family>Symbol</family>
-     </default>
-   </alias>
-</fontconfig>
-
diff --git a/62-google-croscore-tinos-fontconfig.conf b/62-google-tinos-fonts.conf
similarity index 100%
rename from 62-google-croscore-tinos-fontconfig.conf
rename to 62-google-tinos-fonts.conf
diff --git a/google-croscore-arimo.metainfo.xml b/google-croscore-arimo.metainfo.xml
deleted file mode 100644
index b4b7313..0000000
--- a/google-croscore-arimo.metainfo.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 Parag Nemade <pnemade AT redhat DOT com> -->
-<component type="font">
-  <id>google-croscore</id>
-  <metadata_license>CC-BY-3.0</metadata_license>
-  <name>Arimo</name>
-  <summary>The croscore Arimo family fonts</summary>
-  <description>
-    <p>
-      Arimo was designed by Steve Matteson as an innovative, refreshing sans serif
-      design that is metrically compatible with Arial. Arimo offers improved
-      on-screen readability characteristics and the pan-European WGL character set
-      and solves the needs of developers looking for width-compatible fonts to
-      address document portability across platforms.
-    </p>
-  </description>
-  <updatecontact>pnemade_at_redhat_dot_com</updatecontact>
-  <url type="homepage"></url>
-</component>
-
diff --git a/google-croscore-cousine.metainfo.xml b/google-croscore-cousine.metainfo.xml
deleted file mode 100644
index ddd0146..0000000
--- a/google-croscore-cousine.metainfo.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 Parag Nemade <pnemade AT redhat DOT com> -->
-<component type="font">
-  <id>google-croscore</id>
-  <metadata_license>CC-BY-3.0</metadata_license>
-  <name>Cousine</name>
-  <summary>The croscore Cousine family fonts</summary>
-  <description>
-    <p>
-      Cousine was designed by Steve Matteson as an innovative, refreshing sans serif
-      design that is metrically compatible with Courier New. Cousine offers improved
-      on-screen readability characteristics and the pan-European WGL character set
-      and solves the needs of developers looking for width-compatible fonts to
-      address document portability across platforms.
-    </p>
-  </description>
-  <updatecontact>pnemade_at_redhat_dot_com</updatecontact>
-  <url type="homepage"></url>
-</component>
-
diff --git a/google-croscore-fonts.spec b/google-croscore-fonts.spec
index 6ad3487..b5f4386 100644
--- a/google-croscore-fonts.spec
+++ b/google-croscore-fonts.spec
@@ -1,150 +1,118 @@
-%global fontname google-croscore
-%global fontconf62 62-%{fontname}
-%global fontconf30 30-0-%{fontname}
+BuildArch: noarch
 
-%global common_desc \
-This package contains a collections of fonts that offers improved on-screen \
-readability characteristics and the pan-European WGL character set and solves \
-the needs of developers looking for width-compatible fonts to address document \
-portability across platforms.
-
-
-Name:           %{fontname}-fonts
 Version:        1.31.0
-Release:        5%{?dist}
-Summary:        The width-compatible fonts for improved on-screen readability
-
+Release:        6%{?dist}
 License:        ASL 2.0
 #URL:            
-Source0:        http://gsdview.appspot.com/chromeos-localmirror/distfiles/croscorefonts-%{version}.tar.bz2
-
-Source1:        62-%{fontname}-arimo-fontconfig.conf
-Source2:        62-%{fontname}-cousine-fontconfig.conf
-Source3:        62-%{fontname}-tinos-fontconfig.conf
-Source4:        30-0-%{fontname}-arimo-fontconfig.conf
-Source5:        30-0-%{fontname}-cousine-fontconfig.conf
-Source6:        30-0-%{fontname}-tinos-fontconfig.conf
-
-# Upstream has not provided license text in their tarball release
-# Add ASL2.0 license text in LICENSE-2.0.txt file
-Source8:        LICENSE-2.0.txt
 
-# metainfo files for gnome-software
-Source9:        %{fontname}-arimo.metainfo.xml
-Source10:        %{fontname}-cousine.metainfo.xml
-Source11:        %{fontname}-tinos.metainfo.xml
+%global foundry           google
+%global fontlicense       ASL 2.0
+%global fontlicenses      LICENSE-2.0.txt
 
-BuildArch:      noarch
-BuildRequires:  fontpackages-devel
+%global common_description %{expand:
+This package contains a collections of fonts that offers improved on-screen
+readability characteristics and the pan-European WGL character set and solves
+the needs of developers looking for width-compatible fonts to address document
+portability across platforms.}
 
-%description
-%common_desc
-
-
-%package common
-Summary:        Common files of %{name}
-Requires:       fontpackages-filesystem
-
-# As upstream stopped distributing SymbolNeu font, let's obsolete this subpackage.
-Obsoletes:      google-croscore-symbolneu-fonts < 1.31.0-1
+%global fontsummary The width-compatible fonts for improved on-screen readability
 
-%description common
-This package consists of files used by other %{name} packages.
+%global archivename croscorefonts-%{version}
 
+%global fontfamily1       Arimo
+%global fontsummary1      The croscore Arimo family fonts
+%global fontpkgheader1    %{expand:
+Provides:  google-croscore-arimo-fonts = %{version}-%{release}
+Obsoletes: google-croscore-arimo-fonts < %{version}-%{release}
+}
+%global fonts1            Arimo*.ttf
+%global fontconfs1        %{SOURCE1} %{SOURCE4}
+%global fontdescription1  %{expand:
+%{common_description}
 
-%package -n %{fontname}-arimo-fonts
-Summary:       The croscore Arimo family fonts 
-Requires:       %{name}-common = %{version}-%{release}
-
-%description -n %{fontname}-arimo-fonts
-%common_desc
 Arimo was designed by Steve Matteson as an innovative, refreshing sans serif
 design that is metrically compatible with Arial. Arimo offers improved 
 on-screen readability characteristics and the pan-European WGL character set 
 and solves the needs of developers looking for width-compatible fonts to 
-address document portability across platforms.
-
-%_font_pkg -n arimo -f *-%{fontname}-arimo.conf Arimo*.ttf
-%{_datadir}/appdata/%{fontname}-arimo.metainfo.xml
+address document portability across platforms.}
+
+%global fontfamily2       Cousine
+%global fontsummary2      The croscore Cousine family fonts
+%global fontpkgheader2    %{expand:
+Provides:  google-croscore-cousine-fonts = %{version}-%{release}
+Obsoletes: google-croscore-cousine-fonts < %{version}-%{release}
+}
+%global fonts2            Cousine*.ttf
+%global fontconfs2        %{SOURCE2} %{SOURCE5}
+%global fontdescription2  %{expand:
+%{common_description}
 
-%package -n %{fontname}-cousine-fonts
-Summary:       The croscore Cousine family fonts
-Requires:       %{name}-common = %{version}-%{release}
-
-%description -n %{fontname}-cousine-fonts
-%common_desc
 Cousine was designed by Steve Matteson as an innovative, refreshing sans serif
 design that is metrically compatible with Courier New. Cousine offers improved
 on-screen readability characteristics and the pan-European WGL character set
 and solves the needs of developers looking for width-compatible fonts to 
-address document portability across platforms.
-
-%_font_pkg -n cousine -f *-%{fontname}-cousine.conf  Cousine*.ttf
-%{_datadir}/appdata/%{fontname}-cousine.metainfo.xml
+address document portability across platforms.}
+
+%global fontfamily3       Tinos
+%global fontsummary3      The croscore Tinos family fonts
+%global fontpkgheader3    %{expand:
+Provides:  google-croscore-tinos-fonts = %{version}-%{release}
+Obsoletes: google-croscore-tinos-fonts < %{version}-%{release}
+}
+%global fonts3            Tinos*.ttf
+%global fontconfs3        %{SOURCE3} %{SOURCE6}
+%global fontdescription3  %{expand:
+%{common_description}
 
-%package -n %{fontname}-tinos-fonts
-Summary:       The croscore Tinos family fonts
-Requires:       %{name}-common = %{version}-%{release}
-
-%description -n %{fontname}-tinos-fonts
-%common_desc
 Tinos was designed by Steve Matteson as an innovative, refreshing serif design
 that is metrically compatible with Times New Roman. Tinos offers improved
 on-screen readability characteristics and the pan-European WGL character set
 and solves the needs of developers looking for width-compatible fonts to
-address document portability across platforms.
+address document portability across platforms.}
+
+
+Source0:        http://gsdview.appspot.com/chromeos-localmirror/distfiles/%{archivename}.tar.bz2
+
+Source1:        62-%{fontpkgname1}.conf
+Source2:        62-%{fontpkgname2}.conf
+Source3:        62-%{fontpkgname3}.conf
+Source4:        30-0-%{fontpkgname1}.conf
+Source5:        30-0-%{fontpkgname2}.conf
+Source6:        30-0-%{fontpkgname3}.conf
+
+# Upstream has not provided license text in their tarball release
+# Add ASL2.0 license text in LICENSE-2.0.txt file
+Source8:        LICENSE-2.0.txt
 
-%_font_pkg -n tinos -f *-%{fontname}-tinos.conf Tinos*.ttf
-%{_datadir}/appdata/%{fontname}-tinos.metainfo.xml
+Name: google-croscore-fonts
+Summary: The width-compatible fonts for improved on-screen readability
+
+%description
+%wordwrap -v common_description
+
+%fontpkg -a
 
 %prep
 %setup -q -n croscorefonts-%{version}
 cp -p %{SOURCE8} .
 
 %build
-
+%fontbuild -a
 
 %install
-install -m 0755 -d %{buildroot}%{_fontdir}
-install -m 0644 -p *.ttf %{buildroot}%{_fontdir}
-
-install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
-                   %{buildroot}%{_fontconfig_confdir}
-
-# Repeat for every font family
-install -m 0644 -p %{SOURCE1} \
-        %{buildroot}%{_fontconfig_templatedir}/%{fontconf62}-arimo.conf
-install -m 0644 -p %{SOURCE2} \
-        %{buildroot}%{_fontconfig_templatedir}/%{fontconf62}-cousine.conf
-install -m 0644 -p %{SOURCE3} \
-        %{buildroot}%{_fontconfig_templatedir}/%{fontconf62}-tinos.conf
-install -m 0644 -p %{SOURCE4} \
-        %{buildroot}%{_fontconfig_templatedir}/%{fontconf30}-arimo.conf
-install -m 0644 -p %{SOURCE5} \
-        %{buildroot}%{_fontconfig_templatedir}/%{fontconf30}-cousine.conf
-install -m 0644 -p %{SOURCE6} \
-        %{buildroot}%{_fontconfig_templatedir}/%{fontconf30}-tinos.conf
-
-for fconf in %{fontconf62}-arimo.conf %{fontconf30}-arimo.conf \
-             %{fontconf62}-cousine.conf %{fontconf30}-cousine.conf \
-             %{fontconf62}-tinos.conf %{fontconf30}-tinos.conf
-do
-  ln -s %{_fontconfig_templatedir}/$fconf \
-        %{buildroot}%{_fontconfig_confdir}/$fconf
-done
-
-# Add AppStream metadata
-install -Dm 0644 -p %{SOURCE9} \
-        %{buildroot}%{_datadir}/appdata/%{fontname}-arimo.metainfo.xml
-install -Dm 0644 -p %{SOURCE10} \
-        %{buildroot}%{_datadir}/appdata/%{fontname}-cousine.metainfo.xml
-install -Dm 0644 -p %{SOURCE11} \
-        %{buildroot}%{_datadir}/appdata/%{fontname}-tinos.metainfo.xml
-
-%files common
-%license LICENSE-2.0.txt
+echo %{fontpkgname}
+%fontinstall -a
+
+%check
+%fontcheck -a
+
+%fontfiles -a
 
 %changelog
+* Tue Mar 10 2020 Parag Nemade <pnemade AT redhat DOT com> - 1.31.0-6
+- Convert to new fonts packaging guidelines
+- Dropped Obsoletes: google-croscore-symbolneu-fonts (Added in F29)
+
 * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.31.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
diff --git a/google-croscore-tinos.metainfo.xml b/google-croscore-tinos.metainfo.xml
deleted file mode 100644
index d033f28..0000000
--- a/google-croscore-tinos.metainfo.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 Parag Nemade <pnemade AT redhat DOT com> -->
-<component type="font">
-  <id>google-croscore</id>
-  <metadata_license>CC-BY-3.0</metadata_license>
-  <name>Tinos</name>
-  <summary>The croscore Tinos family fonts</summary>
-  <description>
-    <p>
-      Tinos was designed by Steve Matteson as an innovative, refreshing serif design
-      that is metrically compatible with Times New Roman. Tinos offers improved
-      on-screen readability characteristics and the pan-European WGL character set
-      and solves the needs of developers looking for width-compatible fonts to
-      address document portability across platforms.
-    </p>
-  </description>
-  <updatecontact>pnemade_at_redhat_dot_com</updatecontact>
-  <url type="homepage"></url>
-</component>
-