import appstream-data-8-20200724.el8

.appstream-data.metadata

@@ -1,2 +1,4 @@
-c27c7750d13223a5d189826e97391292ddc50f25 SOURCES/rhel-8-20190805-icons.tar.gz
-7d773783073bdc28d68fccc590b3783a5adb13bb SOURCES/rhel-8-20190805.xml.gz
+c01fab7926a0fd4f2b1196600b5dd1b2ad4b5425 SOURCES/epel-8-20200724-icons.tar.gz
+6b08557071ff73d81cc4a4bbab5908ef3e21238f SOURCES/epel-8-20200724.xml.gz
+d22ded3cd4471c1db4835f7cdf01a4b8317f69f1 SOURCES/rhel-8-20200724-icons.tar.gz
+811c4fe5e36dde125dfb0d3a48a6fc9dce80192c SOURCES/rhel-8-20200724.xml.gz

.gitignore

@@ -1,2 +1,4 @@
-SOURCES/rhel-8-20190805-icons.tar.gz
-SOURCES/rhel-8-20190805.xml.gz
+SOURCES/epel-8-20200724-icons.tar.gz
+SOURCES/epel-8-20200724.xml.gz
+SOURCES/rhel-8-20200724-icons.tar.gz
+SOURCES/rhel-8-20200724.xml.gz

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>

SPECS/appstream-data.spec

@@ -1,4 +1,4 @@
-%define gitdate 20190805
+%define gitdate 20200724
 
 Summary:   Cached AppStream metadata
 Name:      appstream-data
@@ -15,28 +15,33 @@ Source5:   https://raw.githubusercontent.com/hughsie/fedora-appstream/master/app
 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
+Source9:   http://people.redhat.com/rhughes/metadata/epel-%{version}-%{gitdate}.xml.gz
+Source10:  http://people.redhat.com/rhughes/metadata/epel-%{version}-%{gitdate}-icons.tar.gz
+
 # 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.1-baseos -p mnt/rhel-8.1-baseos/ &> rhel-8.1-baseos.log
-# dnf reposync --setopt=*.module_hotfixes=1 --repo rhel-8.1-appstream -p mnt/rhel-8.1-appstream/ &> rhel-8.1-appstream.log
-# dnf reposync --setopt=*.module_hotfixes=1 --repo rhel-8.1-crb -p mnt/rhel-8.1-crb/ &> rhel-8.1-crb.log
+# 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
+# dnf reposync --setopt=*.module_hotfixes=1 --repo rhel-8-crb -p mnt/ &> rhel-8-crb.log
 # https://github.com/hughsie/appstream-scripts/blob/master/rhel/rhel-8.1-candidate.sh
 #
-# [rhel-8.1-baseos]
+# [rhel-8-baseos]
 # name=Nightly Packages for Enterprise Linux 8
-# baseurl=http://download.eng.brq.redhat.com/composes/nightly/latest-RHEL-8.1/compose/BaseOS/x86_64/os/
+# baseurl=http://download.eng.brq.redhat.com/composes/nightly/latest-RHEL-8/compose/BaseOS/x86_64/os/
 # enabled=1
 # gpgcheck=0
 #
-# [rhel-8.1-appstream]
+# [rhel-8-appstream]
 # name=Nightly Packages for Enterprise Linux 8
-# baseurl=http://download.eng.brq.redhat.com/composes/nightly/latest-RHEL-8.1/compose/AppStream/x86_64/os/
+# baseurl=http://download.eng.brq.redhat.com/composes/nightly/latest-RHEL-8/compose/AppStream/x86_64/os/
 # enabled=1
 # gpgcheck=0
 #
-# [rhel-8.1-crb]
+# [rhel-8-crb]
 # name=Nightly Packages for Enterprise Linux 8
-# baseurl=http://download.eng.brq.redhat.com/composes/nightly/latest-RHEL-8.1/compose/CRB/x86_64/os/
+# baseurl=http://download.eng.brq.redhat.com/composes/nightly/latest-RHEL-8/compose/CRB/x86_64/os/
 # enabled=1
 # gpgcheck=0
 
@@ -48,20 +53,36 @@ for the GNOME and KDE software centers.
 
 %install
 
-DESTDIR=%{buildroot} appstream-util install-origin rhel-8 %{SOURCE1} %{SOURCE2}
+DESTDIR=%{buildroot} appstream-util install-origin rhel-%{version} %{SOURCE1} %{SOURCE2}
+DESTDIR=%{buildroot} appstream-util install-origin epel-%{version} %{SOURCE9} %{SOURCE10}
 DESTDIR=%{buildroot} appstream-util install \
 	%{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7}
 
 %files
 %attr(0644,root,root) %{_datadir}/app-info/xmls/*
 %{_datadir}/app-info/icons/rhel-%{version}/*/*.png
+%{_datadir}/app-info/icons/epel-%{version}/*/*.png
 %dir %{_datadir}/app-info
 %dir %{_datadir}/app-info/icons
 %dir %{_datadir}/app-info/icons/rhel-%{version}/64x64
 %dir %{_datadir}/app-info/icons/rhel-%{version}/128x128
+%dir %{_datadir}/app-info/icons/epel-%{version}/64x64
+%dir %{_datadir}/app-info/icons/epel-%{version}/128x128
 %dir %{_datadir}/app-info/xmls
 
 %changelog
+* Fri Jul 24 2020 Richard Hughes <richard@hughsie.com> 8-20200724
+- Regenerate the RHEL metadata to include the EPEL apps too
+- Resolves: #1844488
+
+* 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
+
 * Mon Aug 05 2019 Richard Hughes <richard@hughsie.com> 8-20190805
 - Regenerate the RHEL metadata to include the latest cockpit changes
 - Resolves: #1673011