diff --git a/.appstream-data.metadata b/.appstream-data.metadata
index e8e6cb1..4b76b09 100644
--- a/.appstream-data.metadata
+++ b/.appstream-data.metadata
@@ -1,4 +1,4 @@
-ab65007d7037887b8ae57ed1c6e20f7931429dbc SOURCES/epel-9-20230504-icons.tar.gz
-ba2ef73fe81ce008be19720247b0a00e9f7e287b SOURCES/epel-9-20230504.xml.gz
-260190fd91963ae4db1b61febfa3a78b85c6e0f3 SOURCES/rhel-9-20230504-icons.tar.gz
-a846b1fc32325d57c434994bc9dd0be2f1adb82e SOURCES/rhel-9-20230504.xml.gz
+643118c4bed078da5c13e3afc15f67b8ed8f419a SOURCES/epel-9-20240827-icons.tar.gz
+4fdad3371965ad037970336a96afd1ebfd843053 SOURCES/epel-9-20240827.xml.gz
+92985a6ed82cf7b7dea7e5a999cfdb1dd9516fde SOURCES/rhel-9-20240827-icons.tar.gz
+2aedcb1909c89153ffa97ee16b2d185055a51f11 SOURCES/rhel-9-20240827.xml.gz
diff --git a/.gitignore b/.gitignore
index b94cd75..dfa764a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-SOURCES/epel-9-20230504-icons.tar.gz
-SOURCES/epel-9-20230504.xml.gz
-SOURCES/rhel-9-20230504-icons.tar.gz
-SOURCES/rhel-9-20230504.xml.gz
+SOURCES/epel-9-20240827-icons.tar.gz
+SOURCES/epel-9-20240827.xml.gz
+SOURCES/rhel-9-20240827-icons.tar.gz
+SOURCES/rhel-9-20240827.xml.gz
diff --git a/SOURCES/fedora-categories.xml b/SOURCES/fedora-categories.xml
deleted file mode 100644
index 0ada039..0000000
--- a/SOURCES/fedora-categories.xml
+++ /dev/null
@@ -1,594 +0,0 @@
-
-
-
-
-
- org.kde.amarok.desktop
-
- AudioVideo
- Featured
-
-
-
- org.gnome.Cheese.desktop
-
- AudioVideo
- Featured
-
-
-
- org.gnome.Totem.desktop
-
- AudioVideo
- Featured
-
-
-
- org.pitivi.Pitivi
-
- AudioVideo
- Featured
-
-
-
- org.videolan.vlc
-
- AudioVideo
- Featured
-
-
-
- ardour6.desktop
-
- AudioVideo
- Featured
-
-
-
- org.audacityteam.Audacity
-
- AudioVideo
- Featured
-
-
-
- brasero.desktop
-
- AudioVideo
- Featured
-
-
-
- easytag.desktop
-
- AudioVideo
- Featured
-
-
-
- org.gnome.Music.desktop
-
- AudioVideo
- Featured
-
-
-
- rhythmbox.desktop
-
- AudioVideo
- Featured
-
-
-
- com.rosegardenmusic.rosegarden.desktop
-
- AudioVideo
- Featured
-
-
-
- org.gnome.SoundJuicer.desktop
-
- AudioVideo
- Featured
-
-
-
- org.gnome.Builder.desktop
-
- Development
- Featured
-
-
-
- org.gnome.Devhelp.desktop
-
- Development
- Featured
-
-
-
- org.gnome.dfeet.desktop
-
- Development
- Featured
-
-
-
- eclipse.desktop
-
- Development
- Featured
-
-
-
- org.gnome.gitg
-
- Development
- Featured
-
-
-
- org.gnome.Glade
-
- Development
- Featured
-
-
-
- monodevelop.desktop
-
- Development
- Featured
-
-
-
- org.gnome.gedit.desktop
-
- Development
- Featured
-
-
-
- celestia.desktop
-
- Science
- Featured
-
-
-
- com.play0ad.zeroad
-
- Game
- Featured
-
-
-
- io.github.endless_sky.endless_sky
-
- Game
- Featured
-
-
-
- frozen-bubble.desktop
-
- Game
- Featured
-
-
-
- org.gnome.Chess
-
- Game
- Featured
-
-
-
- org.gnome.Mahjongg
-
- Game
- Featured
-
-
-
- org.gnome.Mines
-
- Game
- Featured
-
-
-
- org.gnome.Sudoku
-
- Game
- Featured
-
-
-
- org.gnome.Tetravex
-
- Game
- Featured
-
-
-
- org.gnome.Reversi
-
- Game
- Featured
-
-
-
- org.gnome.LightsOff
-
- Game
- Featured
-
-
-
- neverball.desktop
-
- Game
- Featured
-
-
-
- openarena.desktop
-
- Game
- Featured
-
-
-
- org.gnome.Quadrapassel
-
- Game
- Featured
-
-
-
- redeclipse.desktop
-
- Game
- Featured
-
-
-
- sol.desktop
-
- Game
- Featured
-
-
-
- supertuxkart.desktop
-
- Game
- Featured
-
-
-
- org.gnome.SwellFoop.desktop
-
- Game
- Featured
-
-
-
- tremulous.desktop
-
- Game
- Featured
-
-
-
- org.wesnoth.Wesnoth.desktop
-
- Game
- Featured
-
-
-
- xonotic.desktop
-
- Game
- Featured
-
-
-
- org.blender.Blender
-
- Graphics
- Featured
-
-
-
- darktable.desktop
-
- Graphics
- Featured
-
-
-
- org.gimp.GIMP
-
- Graphics
- Featured
-
-
-
- org.inkscape.Inkscape
-
- Graphics
- Featured
-
-
-
- libreoffice-draw.desktop
-
- Graphics
- Featured
-
-
-
- org.mypaint.mypaint
-
- Graphics
- Featured
-
-
-
- org.gnome.font-viewer.desktop
-
- Graphics
- Featured
-
-
-
- scribus.desktop
-
- Graphics
- Featured
-
-
-
- org.gnome.Shotwell.desktop
-
- Graphics
- Featured
-
-
-
- simple-scan.desktop
-
- Graphics
- Featured
-
-
-
- chromium-browser.desktop
-
- Network
- Featured
-
-
-
- org.gnome.Epiphany.desktop
-
- Network
- Featured
-
-
-
- firefox.desktop
-
- Network
- Featured
-
-
-
- org.gnome.Geary.desktop
-
- Network
- Featured
-
-
-
- mozilla-thunderbird.desktop
-
- Network
- Featured
-
-
-
- org.gnome.Polari.desktop
-
- Network
- Featured
-
-
-
- pidgin.desktop
-
- Network
- Featured
-
-
-
- transmission-gtk.desktop
-
- Network
- Featured
-
-
-
- vinagre.desktop
-
- Network
- Featured
-
-
-
- abiword.desktop
-
- Office
- Featured
-
-
-
- homebank.desktop
-
- Office
- Featured
-
-
-
- org.gnome.Evolution.desktop
-
- Office
- Featured
-
-
-
- org.gnome.Geary.desktop
-
- Office
- Featured
-
-
-
- org.gnucash.GnuCash
-
- Office
- Featured
-
-
-
- gnumeric.desktop
-
- Office
- Featured
-
-
-
- org.gramps.gramps
-
- Office
- Featured
-
-
-
- libreoffice-calc.desktop
-
- Office
- Featured
-
-
-
- libreoffice-impress.desktop
-
- Office
- Featured
-
-
-
- libreoffice-writer.desktop
-
- Office
- Featured
-
-
-
- lyx.desktop
-
- Office
- Featured
-
-
-
- org.octave.Octave.desktop
-
- Education
- Featured
-
-
-
- org.stellarium.Stellarium
-
- Education
- Featured
-
-
-
- org.gnome.DiskUtility.desktop
-
- Utility
- Featured
-
-
-
- gparted.desktop
-
- Utility
- Featured
-
-
-
- org.gnome.Boxes.desktop
-
- Utility
- Featured
-
-
-
- virt-manager.desktop
-
- Utility
- Featured
-
-
-
- org.gnome.Notes.desktop
-
- Utility
- Featured
-
-
-
- org.gnome.clocks.desktop
-
- Utility
- Featured
-
-
-
- org.gnome.Documents.desktop
-
- Utility
- Featured
-
-
-
- org.gnome.Photos.desktop
-
- Utility
- Featured
-
-
-
- org.workrave.workrave
-
- Utility
- Featured
-
-
-
- org.openshot.OpenShot
-
- Utility
- Featured
-
-
-
-
diff --git a/SOURCES/fedora-popular.xml b/SOURCES/fedora-popular.xml
deleted file mode 100644
index 5e545c3..0000000
--- a/SOURCES/fedora-popular.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-
-
-
-
-
- org.gnome.Notes.desktop
-
- GnomeSoftware::popular
-
-
-
- calibre-gui.desktop
-
- GnomeSoftware::popular
-
-
-
- org.gnucash.GnuCash
-
- GnomeSoftware::popular
-
-
-
- org.inkscape.Inkscape
-
- GnomeSoftware::popular
-
-
-
- mozilla-thunderbird.desktop
-
- GnomeSoftware::popular
-
-
-
- org.gnome.Geary.desktop
-
- GnomeSoftware::popular
-
-
-
- org.gnome.Maps.desktop
-
- GnomeSoftware::popular
-
-
-
- pdfmod.desktop
-
- GnomeSoftware::popular
-
-
-
- scribus.desktop
-
- GnomeSoftware::popular
-
-
-
- shutter.desktop
-
- GnomeSoftware::popular
-
-
-
- simple-scan.desktop
-
- GnomeSoftware::popular
-
-
-
- org.stellarium.Stellarium
-
- GnomeSoftware::popular
-
-
-
- transmission-gtk.desktop
-
- GnomeSoftware::popular
-
-
-
diff --git a/SPECS/appstream-data.spec b/SPECS/appstream-data.spec
index a970b95..9025873 100644
--- a/SPECS/appstream-data.spec
+++ b/SPECS/appstream-data.spec
@@ -1,4 +1,4 @@
-%define gitdate 20230504
+%define gitdate 20240827
%global enable_epel 1
Summary: Cached AppStream metadata
@@ -8,14 +8,12 @@ Version: 9
Release: %{gitdate}%{?dist}
BuildArch: noarch
License: CC0 and CC-BY and CC-BY-SA and GFDL
-URL: http://people.redhat.com/rhughes/metadata/
-Source1: http://people.redhat.com/rhughes/metadata/rhel-%{version}-%{gitdate}.xml.gz
-Source2: http://people.redhat.com/rhughes/metadata/rhel-%{version}-%{gitdate}-icons.tar.gz
+URL: https://people.redhat.com/rhughes/metadata/
+Source1: https://people.redhat.com/rhughes/metadata/rhel-%{version}-%{gitdate}.xml.gz
+Source2: https://people.redhat.com/rhughes/metadata/rhel-%{version}-%{gitdate}-icons.tar.gz
Source3: https://raw.githubusercontent.com/hughsie/fedora-appstream/master/appstream-extra/adobe-flash.xml
Source4: https://raw.githubusercontent.com/hughsie/fedora-appstream/master/appstream-extra/gstreamer-non-free.xml
Source5: https://raw.githubusercontent.com/hughsie/fedora-appstream/master/appstream-extra/other-repos.xml
-Source6: https://raw.githubusercontent.com/hughsie/fedora-appstream/master/appstream-extra/fedora-categories.xml
-Source7: https://raw.githubusercontent.com/hughsie/fedora-appstream/master/appstream-extra/fedora-popular.xml
# extra applications not in RHEL
%if 0%{?enable_epel}
@@ -25,10 +23,10 @@ Source10: http://people.redhat.com/rhughes/metadata/epel-%{version}-%{gitdate}-
# This is built using:
# sudo dnf makecache --enablerepo rhel-9-baseos --enablerepo rhel-9-appstream --enablerepo rhel-9-crb
-# export ARCHIVE_PATH=/run/media/hughsie/Backup/mirror
-# dnf reposync --setopt=*.module_hotfixes=1 --repo rhel-9-baseos -p ${ARCHIVE_PATH}/RHEL/ &> rhel-9-baseos.log
-# dnf reposync --setopt=*.module_hotfixes=1 --repo rhel-9-appstream -p ${ARCHIVE_PATH}/RHEL/ &> rhel-9-appstream.log
-# dnf reposync --setopt=*.module_hotfixes=1 --repo rhel-9-crb -p ${ARCHIVE_PATH}/RHEL/ &> rhel-9-crb.log
+# export ARCHIVE_PATH=/media
+# dnf reposync --setopt=*.module_hotfixes=1 --repo rhel-9-baseos -p ${ARCHIVE_PATH}/rhel/ &> rhel-9-baseos.log
+# dnf reposync --setopt=*.module_hotfixes=1 --repo rhel-9-appstream -p ${ARCHIVE_PATH}/rhel/ &> rhel-9-appstream.log
+# dnf reposync --setopt=*.module_hotfixes=1 --repo rhel-9-crb -p ${ARCHIVE_PATH}/rhel/ &> rhel-9-crb.log
# https://github.com/hughsie/appstream-scripts/blob/master/rhel/rhel-9-candidate.sh
# then the sources need to be uploaded to people.redhat.com/rhughes/metadata/
@@ -45,7 +43,7 @@ DESTDIR=%{buildroot} appstream-util install-origin rhel-%{version} %{SOURCE1} %{
DESTDIR=%{buildroot} appstream-util install-origin epel-%{version} %{SOURCE9} %{SOURCE10}
%endif
DESTDIR=%{buildroot} appstream-util install \
- %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7}
+ %{SOURCE3} %{SOURCE4} %{SOURCE5}
%files
%attr(0644,root,root) %{_datadir}/app-info/xmls/*
@@ -64,6 +62,12 @@ DESTDIR=%{buildroot} appstream-util install \
%dir %{_datadir}/app-info/xmls
%changelog
+* Tue Aug 27 2024 Richard Hughes 1:9-20240827
+- New metadata version
+- Do not ship fedora-specific files
+- Resolves: #RHEL-4522
+- Resolves: #RHEL-19012
+
* Thu May 04 2023 Richard Hughes 1:9-20230504
- New metadata version
- Resolves: rhbz#2062807