diff --git a/.appstream-data.metadata b/.appstream-data.metadata
index 7c27c1d..09a18c0 100644
--- a/.appstream-data.metadata
+++ b/.appstream-data.metadata
@@ -1,2 +1,2 @@
-1f5e5c34af15ec7d180e6a4c5f5603b483ab75e0 SOURCES/rhel-8-20191129-icons.tar.gz
-a8a6a3f8c4dc5007cf819469a0622879af380104 SOURCES/rhel-8-20191129.xml.gz
+8717d3f969c3691a0425c150a03d1b226200625f SOURCES/rhel-8-20200630-icons.tar.gz
+18abd8606245c48feadd169c71204ec70d99fa48 SOURCES/rhel-8-20200630.xml.gz
diff --git a/.gitignore b/.gitignore
index 7204a5a..9799f38 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-SOURCES/rhel-8-20191129-icons.tar.gz
-SOURCES/rhel-8-20191129.xml.gz
+SOURCES/rhel-8-20200630-icons.tar.gz
+SOURCES/rhel-8-20200630.xml.gz
diff --git a/SOURCES/fedora-categories.xml b/SOURCES/fedora-categories.xml
index 6793d41..ea5f39a 100644
--- a/SOURCES/fedora-categories.xml
+++ b/SOURCES/fedora-categories.xml
@@ -5,522 +5,595 @@
<component type="desktop">
<id>org.kde.amarok.desktop</id>
<categories>
+ <category>AudioVideo</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
- <id>ardour5.desktop</id>
+ <id>org.gnome.Cheese.desktop</id>
+ <categories>
+ <category>AudioVideo</category>
+ <category>Featured</category>
+ </categories>
+ </component>
+ <component type="desktop">
+ <id>org.gnome.Totem.desktop</id>
+ <categories>
+ <category>AudioVideo</category>
+ <category>Featured</category>
+ </categories>
+ </component>
+ <component type="desktop">
+ <id>org.pitivi.Pitivi</id>
+ <categories>
+ <category>AudioVideo</category>
+ <category>Featured</category>
+ </categories>
+ </component>
+ <component type="desktop">
+ <id>org.videolan.vlc</id>
<categories>
+ <category>AudioVideo</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
- <id>audacity.desktop</id>
+ <id>ardour5.desktop</id>
<categories>
+ <category>AudioVideo</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
- <id>banshee.desktop</id>
+ <id>org.audacityteam.Audacity</id>
<categories>
+ <category>AudioVideo</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
<id>brasero.desktop</id>
<categories>
+ <category>AudioVideo</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
<id>easytag.desktop</id>
<categories>
+ <category>AudioVideo</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
<id>org.gnome.Music.desktop</id>
<categories>
+ <category>AudioVideo</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
<id>rhythmbox.desktop</id>
<categories>
+ <category>AudioVideo</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
<id>com.rosegardenmusic.rosegarden.desktop</id>
<categories>
+ <category>AudioVideo</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
<id>org.gnome.SoundJuicer.desktop</id>
<categories>
+ <category>AudioVideo</category>
+ <category>Featured</category>
+ </categories>
+ </component>
+ <component type="desktop">
+ <id>org.gnome.Builder.desktop</id>
+ <categories>
+ <category>Development</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
<id>org.gnome.Devhelp.desktop</id>
<categories>
+ <category>Development</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
- <id>d-feet.desktop</id>
+ <id>org.gnome.dfeet.desktop</id>
<categories>
+ <category>Development</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
<id>eclipse.desktop</id>
<categories>
+ <category>Development</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
- <id>gitg.desktop</id>
+ <id>org.gnome.gitg</id>
<categories>
+ <category>Development</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
<id>glade.desktop</id>
<categories>
+ <category>Development</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
<id>monodevelop.desktop</id>
<categories>
+ <category>Development</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
<id>org.gnome.gedit.desktop</id>
<categories>
+ <category>Development</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
<id>celestia.desktop</id>
<categories>
+ <category>Science</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
- <id>0ad.desktop</id>
+ <id>com.play0ad.zeroad</id>
<categories>
+ <category>Game</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
<id>btanks.desktop</id>
<categories>
+ <category>Game</category>
+ <category>Featured</category>
+ </categories>
+ </component>
+ <component type="desktop">
+ <id>io.github.endless_sky.endless_sky</id>
+ <categories>
+ <category>Game</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
<id>frozen-bubble.desktop</id>
<categories>
+ <category>Game</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
- <id>gnome-chess.desktop</id>
+ <id>org.gnome.Chess</id>
<categories>
+ <category>Game</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
- <id>gnome-mahjongg.desktop</id>
+ <id>org.gnome.Mahjongg</id>
<categories>
+ <category>Game</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
- <id>gnome-mines.desktop</id>
+ <id>org.gnome.Mines</id>
<categories>
+ <category>Game</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
- <id>gnome-sudoku.desktop</id>
+ <id>org.gnome.Sudoku</id>
<categories>
+ <category>Game</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
- <id>gnome-tetravex.desktop</id>
+ <id>org.gnome.Tetravex</id>
<categories>
+ <category>Game</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
- <id>iagno.desktop</id>
+ <id>org.gnome.Reversi</id>
<categories>
+ <category>Game</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
- <id>lightsoff.desktop</id>
+ <id>org.gnome.LightsOff</id>
<categories>
+ <category>Game</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
<id>neverball.desktop</id>
<categories>
+ <category>Game</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
<id>openarena.desktop</id>
<categories>
+ <category>Game</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
- <id>quadrapassel.desktop</id>
+ <id>org.gnome.Quadrapassel</id>
<categories>
+ <category>Game</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
<id>redeclipse.desktop</id>
<categories>
+ <category>Game</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
<id>sol.desktop</id>
<categories>
+ <category>Game</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
<id>supertuxkart.desktop</id>
<categories>
+ <category>Game</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
- <id>swell-foop.desktop</id>
+ <id>org.gnome.SwellFoop.desktop</id>
<categories>
+ <category>Game</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
<id>tremulous.desktop</id>
<categories>
+ <category>Game</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
- <id>wesnoth.desktop</id>
+ <id>org.wesnoth.Wesnoth.desktop</id>
<categories>
+ <category>Game</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
<id>xonotic.desktop</id>
<categories>
+ <category>Game</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
- <id>blender.desktop</id>
+ <id>org.blender.Blender</id>
<categories>
+ <category>Graphics</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
<id>darktable.desktop</id>
<categories>
+ <category>Graphics</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
- <id>gimp.desktop</id>
+ <id>org.gimp.GIMP</id>
<categories>
+ <category>Graphics</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
- <id>inkscape.desktop</id>
+ <id>org.inkscape.Inkscape</id>
<categories>
+ <category>Graphics</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
<id>libreoffice-draw.desktop</id>
<categories>
+ <category>Graphics</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
<id>mypaint.desktop</id>
<categories>
+ <category>Graphics</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
<id>org.gnome.font-viewer.desktop</id>
<categories>
+ <category>Graphics</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
<id>scribus.desktop</id>
<categories>
+ <category>Graphics</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
- <id>shotwell.desktop</id>
+ <id>org.gnome.Shotwell.desktop</id>
<categories>
+ <category>Graphics</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
<id>simple-scan.desktop</id>
<categories>
+ <category>Graphics</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
<id>chromium-browser.desktop</id>
<categories>
+ <category>Network</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
<id>org.gnome.Epiphany.desktop</id>
<categories>
+ <category>Network</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
<id>firefox.desktop</id>
<categories>
+ <category>Network</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
<id>org.gnome.Geary.desktop</id>
<categories>
+ <category>Network</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
<id>mozilla-thunderbird.desktop</id>
<categories>
+ <category>Network</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
<id>org.gnome.Polari.desktop</id>
<categories>
+ <category>Network</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
<id>pidgin.desktop</id>
<categories>
+ <category>Network</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
<id>transmission-gtk.desktop</id>
<categories>
+ <category>Network</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
<id>vinagre.desktop</id>
<categories>
+ <category>Network</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
<id>abiword.desktop</id>
<categories>
+ <category>Office</category>
+ <category>Featured</category>
+ </categories>
+ </component>
+ <component type="desktop">
+ <id>homebank.desktop</id>
+ <categories>
+ <category>Office</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
<id>org.gnome.Evolution.desktop</id>
<categories>
+ <category>Office</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
<id>org.gnome.Geary.desktop</id>
<categories>
+ <category>Office</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
- <id>gnucash.desktop</id>
+ <id>org.gnucash.GnuCash</id>
<categories>
+ <category>Office</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
<id>gnumeric.desktop</id>
<categories>
+ <category>Office</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
- <id>gramps.desktop</id>
+ <id>org.gramps.gramps</id>
<categories>
+ <category>Office</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
<id>libreoffice-calc.desktop</id>
<categories>
+ <category>Office</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
<id>libreoffice-impress.desktop</id>
<categories>
+ <category>Office</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
<id>libreoffice-writer.desktop</id>
<categories>
+ <category>Office</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
<id>lyx.desktop</id>
<categories>
+ <category>Office</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
- <id>www.octave.org-octave.desktop</id>
- <categories>
- <category>Featured</category>
- </categories>
- </component>
- <component type="desktop">
- <id>saoimage.desktop</id>
+ <id>org.octave.Octave.desktop</id>
<categories>
+ <category>Education</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
- <id>stellarium.desktop</id>
+ <id>org.stellarium.Stellarium</id>
<categories>
+ <category>Education</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
<id>org.gnome.DiskUtility.desktop</id>
<categories>
+ <category>Utility</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
<id>gparted.desktop</id>
<categories>
+ <category>Utility</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
<id>org.gnome.Boxes.desktop</id>
<categories>
+ <category>Utility</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
<id>virt-manager.desktop</id>
<categories>
+ <category>Utility</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
- <id>org.gnome.bijiben.desktop</id>
+ <id>org.gnome.Notes.desktop</id>
<categories>
+ <category>Utility</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
<id>org.gnome.clocks.desktop</id>
<categories>
+ <category>Utility</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
<id>org.gnome.Documents.desktop</id>
<categories>
+ <category>Utility</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
<id>org.gnome.Photos.desktop</id>
<categories>
+ <category>Utility</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
<id>workrave.desktop</id>
<categories>
+ <category>Utility</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop">
- <id>openshot-qt.desktop</id>
- <categories>
- <category>Featured</category>
- </categories>
- </component>
- <component type="desktop">
- <id>org.gnome.Cheese.desktop</id>
- <categories>
- <category>Featured</category>
- </categories>
- </component>
- <component type="desktop">
- <id>org.gnome.Totem.desktop</id>
- <categories>
- <category>Featured</category>
- </categories>
- </component>
- <component type="desktop">
- <id>pitivi.desktop</id>
- <categories>
- <category>Featured</category>
- </categories>
- </component>
- <component type="desktop">
- <id>vlc.desktop</id>
- <categories>
- <category>Featured</category>
- </categories>
- </component>
- <component type="desktop">
- <id>org.gnome.Builder.desktop</id>
- <categories>
- <category>Featured</category>
- </categories>
- </component>
- <component type="desktop">
- <id>homebank.desktop</id>
- <categories>
- <category>Featured</category>
- </categories>
- </component>
- <component type="desktop">
- <id>endless-sky.desktop</id>
+ <id>openshot-qt</id>
<categories>
+ <category>Utility</category>
<category>Featured</category>
</categories>
</component>
diff --git a/SOURCES/fedora-popular.xml b/SOURCES/fedora-popular.xml
index fd9bc55..79c003f 100644
--- a/SOURCES/fedora-popular.xml
+++ b/SOURCES/fedora-popular.xml
@@ -3,7 +3,7 @@
<!-- Apps for the GNOME Software "Editor's Picks" list -->
<component type="desktop">
- <id>org.gnome.bijiben.desktop</id>
+ <id>org.gnome.Notes.desktop</id>
<kudos>
<kudo>GnomeSoftware::popular</kudo>
</kudos>
@@ -15,19 +15,13 @@
</kudos>
</component>
<component type="desktop">
- <id>gnucash.desktop</id>
+ <id>org.gnucash.GnuCash</id>
<kudos>
<kudo>GnomeSoftware::popular</kudo>
</kudos>
</component>
<component type="desktop">
- <id>gtg.desktop</id>
- <kudos>
- <kudo>GnomeSoftware::popular</kudo>
- </kudos>
- </component>
- <component type="desktop">
- <id>inkscape.desktop</id>
+ <id>org.inkscape.Inkscape</id>
<kudos>
<kudo>GnomeSoftware::popular</kudo>
</kudos>
@@ -81,7 +75,7 @@
</kudos>
</component>
<component type="desktop">
- <id>stellarium.desktop</id>
+ <id>org.stellarium.Stellarium</id>
<kudos>
<kudo>GnomeSoftware::popular</kudo>
</kudos>
diff --git a/SPECS/appstream-data.spec b/SPECS/appstream-data.spec
index 6a32d30..aea4e70 100644
--- a/SPECS/appstream-data.spec
+++ b/SPECS/appstream-data.spec
@@ -1,4 +1,4 @@
-%define gitdate 20191129
+%define gitdate 20200630
Summary: Cached AppStream metadata
Name: appstream-data
@@ -16,6 +16,7 @@ Source6: https://raw.githubusercontent.com/hughsie/fedora-appstream/master/app
Source7: https://raw.githubusercontent.com/hughsie/fedora-appstream/master/appstream-extra/fedora-popular.xml
# This is built using:
+# dnf install fuse-sshfs -y
# sshfs user@host:/mnt/mirror/RHEL mnt
# dnf reposync --setopt=*.module_hotfixes=1 --repo rhel-8-baseos -p mnt/ &> rhel-8-baseos.log
# dnf reposync --setopt=*.module_hotfixes=1 --repo rhel-8-appstream -p mnt/ &> rhel-8-appstream.log
@@ -62,6 +63,10 @@ DESTDIR=%{buildroot} appstream-util install \
%dir %{_datadir}/app-info/xmls
%changelog
+* Tue Jun 30 2020 Richard Hughes <richard@hughsie.com> 8-20200630
+- Regenerate the RHEL metadata
+- Resolves: #1844488
+
* Fri Nov 29 2019 Richard Hughes <richard@hughsie.com> 8-20191129
- Regenerate the RHEL metadata to include the latest evince changes
- Resolves: #1768461