From a49ff1c6051415afebfbb611400e815bffcf4df4 Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard@hughsie.com>
Date: Tue, 27 Aug 2024 12:03:59 +0100
Subject: [PATCH] New metadata version

Resolves: #RHEL-4522
Resolves: #RHEL-19012
---
 .gitignore          |  4 ++++
 appstream-data.spec | 26 +++++++++++++++-----------
 sources             |  8 ++++----
 3 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/.gitignore b/.gitignore
index e39994f..7413d0b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,7 @@
 /rhel-9-20230504.xml.gz
 /epel-9-20230504-icons.tar.gz
 /epel-9-20230504.xml.gz
+/rhel-9-20240827-icons.tar.gz
+/rhel-9-20240827.xml.gz
+/epel-9-20240827-icons.tar.gz
+/epel-9-20240827.xml.gz
diff --git a/appstream-data.spec b/appstream-data.spec
index a970b95..9025873 100644
--- a/appstream-data.spec
+++ b/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 <richard@hughsie.com> 1:9-20240827
+- New metadata version
+- Do not ship fedora-specific files
+- Resolves: #RHEL-4522
+- Resolves: #RHEL-19012
+
 * Thu May 04 2023 Richard Hughes <richard@hughsie.com> 1:9-20230504
 - New metadata version
 - Resolves: rhbz#2062807
diff --git a/sources b/sources
index f9b3bd9..090d87e 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-SHA512 (rhel-9-20230504-icons.tar.gz) = 34eeeb24bdcef50d7ceaecc014b1bd45d462cc1ab0d8df806cb8316187cd5bf949f27871d561d9597b236342439fab31b961aa13e7dc838358149efa457851a3
-SHA512 (rhel-9-20230504.xml.gz) = 130ee33ec58e09f702eb8f779dfcd65842cb4573136e553d2bb5468869c295225532c23ac5fb074a725b2026d110f494b90fe58a27b2acc6fe9cad5eefc609f5
-SHA512 (epel-9-20230504-icons.tar.gz) = 8aead728755d92ab1a8e4d0fb7a0b77b6fbdbd1654d1de99490de7997979aa2bfbcb0918e3a3d1ddbd82926161e85632318ab4a6600a41ced1b9f8bd6b6dfeeb
-SHA512 (epel-9-20230504.xml.gz) = e95ef4b79b6e9f18de257640235d7fa823c839254723b3917f9d683a56b7bf719e51b8d8c24b047143021d477d017c8e319d0e75bba09b1d8fb0c971f864f3c0
+SHA512 (rhel-9-20240827-icons.tar.gz) = 2d4e326ae292898ad7a595f2aca9ef2ea45f39a5c98499e36f42077d721e6d359cc645da91f647218bb107337f7ec48b18e76dcff53e9df9ef388154c069bd71
+SHA512 (rhel-9-20240827.xml.gz) = eddce1af26781516ab9eb2f28e2eff94bb5be52cacf80091dd72f798a6aa1aa95a69d3e737f2c9104f4bf7d34e7b51714e282b51780de84eaa47d8118777b3c1
+SHA512 (epel-9-20240827-icons.tar.gz) = 8ebfa354ebf074a4017ce4a27db5fad1f64a51bb47919084f94ffa90a21db4ab46db89f4ee1069c353fde324c8cfa6681f17e58e4ba8a134570a78411f8bd06e
+SHA512 (epel-9-20240827.xml.gz) = a2c6796ebdddf5435263ce6f50064c7503d6f04a7b98141510586f4fba37b63a2fe4a2de955bd7992351781c2a0f161af8f0d46bd278043b89f52db80431f66d